板块领导

zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractInvoiceRelationDto.java

@@ -31,4 +31,6 @@ public class ContractInvoiceRelationDto {
     private BigDecimal returnAmount;
 
     private Integer contractType;
+
+    private String xmjl;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractSub/event/ContractSubEvent.java

@@ -234,16 +234,11 @@ public class ContractSubEvent extends BaseController {
                 Project project = projectService.selectById(entity.getProjectId());
                 List<Map<String, String>> userMaps = new ArrayList<>();
                 if(StringUtils.isNotBlank(project.getZrbmId())){
-                    CommonResult<DeptRespDTO> result = deptApi.getDept(project.getZrbmId());
-                    DeptRespDTO dept = result.getCheckedData();
-                    if(dept != null && StringUtils.isNotBlank(dept.getLeaderUserId())){
-                        CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUserLeader(dept.getLeaderUserId());
-                        AdminUserRespDTO userLeader = userRes.getCheckedData();
-                        if(userLeader != null){
-                            HashMap<String,String> leaderMap = new HashMap<>();
-                            leaderMap.put("id",userLeader.getId());
-                            userMaps.add(leaderMap);
-                        }
+                    DeptRespDTO deptRespDTO = deptApi.getSecondDeptByDeptId(project.getZrbmId()).getCheckedData();
+                    if (deptRespDTO != null && StringUtils.isNotBlank(deptRespDTO.getLeaderUserId())) {
+                        HashMap<String, String> map = new HashMap<>();
+                        map.put("id", deptRespDTO.getLeaderUserId());
+                        userMaps.add(map);
                     }
                 }
                 return ok(userMaps);

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceRelationMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.zjugis.business.mapper.ContractInvoiceRelationMapper">
 
     <select id="selectByInvoiceId" resultType="com.zjugis.business.bean.dto.ContractInvoiceRelationDto">
-        SELECT t.*,t1.AREA_MANAGER,t1.virtual_amount,t1.name as contractName,t2.zrbm  FROM CONTRACT_INVOICE_RELATION t
+        SELECT t.*,t1.AREA_MANAGER,t1.virtual_amount,t1.name as contractName,t2.zrbm,t2.xmjl  FROM CONTRACT_INVOICE_RELATION t
         INNER JOIN CONTRACT t1 ON t1.ID = t.CONTRACT_ID
         LEFT JOIN PROJECT t2 ON t2.ID = t1.PROJECT_ID
         WHERE t.CONTRACT_INVOICE_ID = #{id,jdbcType=VARCHAR} AND t.ISVALID = 1

zjugis-business/src/main/resources/templates/FlowContractInvoice/js/apply.js

@@ -114,7 +114,7 @@
                 let obj = {
                     type: contractList[i].contractType || "",
                     zrbm: contractList[i].zrbm || "",
-                    areaManager: contractList[i].areaManager || "",
+                    xmjl: contractList[i].xmjl || "",
                     virtualAmount: contractList[i].virtualAmount || "",
                     invoiceAmount: contractList[i].invoiceAmount || "",
                     returnAmount: contractList[i].returnAmount || "",
@@ -155,8 +155,8 @@
                 + '<td>'
                 + '<div class="form-flex">'
                 + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-                + '<div class="z-comp-input" name="Contract[' + i + ']$areaManager">'
-                + '<input type="text" value="'+contractInvoiceList[i].areaManager+'">'
+                + '<div class="z-comp-input" name="Contract[' + i + ']$xmjl">'
+                + '<input type="text" value="'+contractInvoiceList[i].xmjl+'">'
                 + '</div>'
                 + '</div>'
                 + '</div>'