Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractResponse.java

@@ -62,6 +62,16 @@ public class ContractResponse {
      */
     private String areaManager;
 
+    /**
+     * 区域总监
+     */
+    private String areaDirector;
+
+    /**
+     * 区域总监ID
+     */
+    private String areaDirectorId;
+
     /**
      * 区域经理ID
      */

zjugis-business/src/main/java/com/zjugis/business/bean/response/ProjectResponse.java

@@ -70,6 +70,7 @@ public class ProjectResponse {
     //总合同额
     private BigDecimal contractAmount;
     private BigDecimal receivableAmount;
+    private BigDecimal returnAmount;
     private BigDecimal contractBalance;
     // 预估合同额
     private BigDecimal planContractAmount;

zjugis-business/src/main/java/com/zjugis/business/flow/contractApply/event/ContractApplyEvent.java

@@ -224,16 +224,11 @@ public class ContractApplyEvent 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/java/com/zjugis/business/service/impl/ProjectServiceImpl.java

@@ -250,6 +250,7 @@ public class ProjectServiceImpl implements ProjectService {
         List<ProjectAmount> projectAmounts = projectAmountService.selectByIds(ids);
         BigDecimal contractAmount = new BigDecimal("0");
         BigDecimal receivableAmount = new BigDecimal("0");
+        BigDecimal returnAmount = new BigDecimal("0");
         BigDecimal contractBalance = new BigDecimal("0");
         for (ProjectAmount projectAmount : projectAmounts) {
             if (projectAmount.getVirtualAmount()==null){
@@ -257,10 +258,12 @@ public class ProjectServiceImpl implements ProjectService {
             }
             contractAmount = contractAmount.add(projectAmount.getVirtualAmount());
             receivableAmount = receivableAmount.add(projectAmount.getReceivableAmount());
+            returnAmount = returnAmount.add(projectAmount.getReturnAmount());
             contractBalance = contractBalance.add(projectAmount.getContractBalance());
         }
         parent.setContractAmount(contractAmount);
         parent.setReceivableAmount(receivableAmount);
+        parent.setReturnAmount(returnAmount);
         parent.setContractBalance(contractBalance);
         projects.remove(0);
         parent.setChildren(projects);

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

@@ -346,7 +346,7 @@
         SELECT c.MAIN_TYPE,c.SECOND_TYPE,c.AMOUNT_STATUS,c.NAME,c.ASSIGNEE_NAME,c.CLIENT_NAME,c.IS_SIGN,
         c.CONTRACT_NUMBER,c.CONTRACT_ON,c.CONTRACT_OFF,c.PAYMENT_TERMS,c.TAX_HSJE_JSKF,c.TAX_HSJE_FW,c.TAX_HSJE_RJCP,
         c.TAX_HSJE_YJ,c.TAX_HSJE_TOTAL,c.TAX_ZHSL,c.TAX_BHSZE,c.TAX_SOFTPATENT,c.WHTK_I_WHQ,c.WHTK_I_MFWH,
-        c.WHTK_WHRQ_BEGIN,c.WHTK_WHRQ_END,c.CREATE_TIME,c.BANKACCOUNT,c.SPECIAL_CLAUSE,c.SIGN_WAY,c.IS_BUSINESS_UNIT,c.BZ,c.ATTACH_RATIO,c.ATTACH_AMOUNT,C.AREA_DIRETCOR,
+        c.WHTK_WHRQ_BEGIN,c.WHTK_WHRQ_END,c.CREATE_TIME,c.BANKACCOUNT,c.SPECIAL_CLAUSE,c.SIGN_WAY,c.IS_BUSINESS_UNIT,c.BZ,c.ATTACH_RATIO,c.ATTACH_AMOUNT,C.AREA_DIRECTOR,
         COALESCE(c.VIRTUAL_AMOUNT, c.CONTRACT_AMOUNT) as CONTRACT_AMOUNT,
         COALESCE(PA.invoiceAmount,0) as invoiceAmount,
         COALESCE(PA.returnAmount,0) as returnAmount,
@@ -443,7 +443,7 @@
         SELECT c2.MAIN_TYPE,c2.SECOND_TYPE,c2.AMOUNT_STATUS,c.NAME,c2.ASSIGNEE_NAME,c2.CLIENT_NAME,c2.IS_SIGN,
         c.CONTRACT_NUMBER,c2.CONTRACT_ON,c2.CONTRACT_OFF,c2.PAYMENT_TERMS,c2.TAX_HSJE_JSKF,c2.TAX_HSJE_FW,c2.TAX_HSJE_RJCP,
         c2.TAX_HSJE_YJ,c2.TAX_HSJE_TOTAL,c2.TAX_ZHSL,c2.TAX_BHSZE,c2.TAX_SOFTPATENT,c2.WHTK_I_WHQ,c2.WHTK_I_MFWH,
-        c2.WHTK_WHRQ_BEGIN,c2.WHTK_WHRQ_END,c.CREATE_TIME,c2.BANKACCOUNT,c2.SPECIAL_CLAUSE,c2.SIGN_WAY,c2.IS_BUSINESS_UNIT,c2.BZ,c2.ATTACH_RATIO,c2.ATTACH_AMOUNT,c2.AREA_DIRETCOR,
+        c2.WHTK_WHRQ_BEGIN,c2.WHTK_WHRQ_END,c.CREATE_TIME,c2.BANKACCOUNT,c2.SPECIAL_CLAUSE,c2.SIGN_WAY,c2.IS_BUSINESS_UNIT,c2.BZ,c2.ATTACH_RATIO,c2.ATTACH_AMOUNT,c2.AREA_DIRECTOR,
         PA.VIRTUAL_AMOUNT as CONTRACT_AMOUNT,PA.INVOICE_AMOUNT,PA.RETURN_AMOUNT,PA.RECEIVABLE_AMOUNT,PA.CONTRACT_BALANCE,
         t1.maxd as returnDate,
         t2.subAmount,t2.subPayAmount,