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

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/event/UseMoneyEvent.java

@@ -185,7 +185,11 @@ public class UseMoneyEvent extends BaseController {
                     if(apply!=null){
                         ContractApply contractSub=new ContractApply();
                         contractSub.setId(entity.getContractId());
-                        contractSub.setPayAmount(apply.getPayAmount().add(entity.getTotalAmount()));
+                        if(apply.getPayAmount()==null){
+                            contractSub.setPayAmount(entity.getTotalAmount());
+                        }else{
+                            contractSub.setPayAmount(apply.getPayAmount().add(entity.getTotalAmount()));
+                        }
                         System.out.println(contractSub);
                         subcontractApplyMapper.updateById(contractSub);
                     }

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -323,15 +323,17 @@ public class UseMoneyServiceImpl implements UseMoneyService {
         PageResult<UseMoneyRespVO> useMoneyRespVOPageResult = UseMoneyConvert.INSTANCE.convertPage(pageResult);
         if (pageResult.getTotal() > 0) {
             List<UseMoneyRespVO> resultList = useMoneyRespVOPageResult.getList();
-            Set<String> projectIds = convertSet(resultList, UseMoneyRespVO::getProjectId);
+            //Set<String> projectIds = convertSet(resultList, UseMoneyRespVO::getProjectId);
             resultList.forEach(useMoneyRespVO -> {
                 Integer isAgent = useMoneyRespVO.getIsAgent();
                 //不是代办项目
                 if (0 == isAgent) {
-                    List<Project> projectList = projectService.selectByIds(projectIds);
-                    Project projectDO = projectList.stream().filter(project -> project.getId().equals(useMoneyRespVO.getProjectId())).findFirst().get();
-                    useMoneyRespVO.setProjectName(projectDO.getXmmc());
-                    useMoneyRespVO.setProjectDeptName(projectDO.getZrbm());
+                    Project projectList = projectService.selectById(useMoneyRespVO.getProjectId());
+                    //Project projectDO = projectList.stream().filter(project -> project.getId().equals(useMoneyRespVO.getProjectId())).findFirst().get();
+                    if(projectList!=null){
+                        useMoneyRespVO.setProjectName(projectList.getXmmc());
+                        useMoneyRespVO.setProjectDeptName(projectList.getZrbm());
+                    }
                 }
                 Integer flowStatus = useMoneyRespVO.getFlowStatus();
                 if (FLOW_FINISHED == flowStatus) {

zjugis-business/src/main/java/com/zjugis/business/service/impl/AssetProcureDetailsServiceImpl.java

@@ -68,6 +68,8 @@ public class AssetProcureDetailsServiceImpl implements AssetProcureDetailsServic
                 DeptRespDTO dept = cust.getCheckedData();
                 if (dept!=null) {
                     assetProcureDetailRespense.setProjectDept(dept.getName());
+                }else{
+                    assetProcureDetailRespense.setProjectDept(null);
                 }
             }
         }
@@ -98,6 +100,8 @@ public class AssetProcureDetailsServiceImpl implements AssetProcureDetailsServic
                 DeptRespDTO dept = cust.getCheckedData();
                 if (dept!=null) {
                     assetProcureDetailRespense.setProjectDept(dept.getName());
+                }else{
+                    assetProcureDetailRespense.setProjectDept(null);
                 }
             }
         }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectServiceImpl.java

@@ -104,23 +104,25 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public Project selectById(String id) {
         Project project = projectMapper.selectById(id);
-        if(StringUtils.isNotBlank(project.getZrbmId())){
-            CommonResult<DeptRespDTO> dept = deptApi.getDept(project.getZrbmId());
-            project.setZrbm(dept.getCheckedData().getName());
-        }
-        List<Contract> contracts = contractService.selectByProject(project.getId());
-        BigDecimal amount = BigDecimal.ZERO;
-        BigDecimal balance = BigDecimal.ZERO;
-        BigDecimal should = BigDecimal.ZERO;
-        for (Contract contract : contracts) {
-            amount = amount.add(contract.getContractAmount() != null? contract.getContractAmount():BigDecimal.ZERO);
-            balance = balance.add(contract.getContractBalance() != null? contract.getContractBalance():BigDecimal.ZERO);
-            should = should.add(contract.getReceivableAmount() != null? contract.getReceivableAmount():BigDecimal.ZERO);
-            project.setContractNumber(contract.getContractNumber());
+        if(project!=null){
+            if(StringUtils.isNotBlank(project.getZrbmId())){
+                CommonResult<DeptRespDTO> dept = deptApi.getDept(project.getZrbmId());
+                project.setZrbm(dept.getCheckedData().getName());
+            }
+            List<Contract> contracts = contractService.selectByProject(project.getId());
+            BigDecimal amount = BigDecimal.ZERO;
+            BigDecimal balance = BigDecimal.ZERO;
+            BigDecimal should = BigDecimal.ZERO;
+            for (Contract contract : contracts) {
+                amount = amount.add(contract.getContractAmount() != null? contract.getContractAmount():BigDecimal.ZERO);
+                balance = balance.add(contract.getContractBalance() != null? contract.getContractBalance():BigDecimal.ZERO);
+                should = should.add(contract.getReceivableAmount() != null? contract.getReceivableAmount():BigDecimal.ZERO);
+                project.setContractNumber(contract.getContractNumber());
+            }
+            project.setContractAmount(amount);
+            project.setContractBalance(balance);
+            project.setReceivableAmount(should);
         }
-        project.setContractAmount(amount);
-        project.setContractBalance(balance);
-        project.setReceivableAmount(should);
         return project;
     }