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

zjugis-business/src/main/java/com/zjugis/business/controller/ManageController.java

@@ -24,17 +24,17 @@ public class ManageController {
     ManageService manageService;
 
     @GetMapping("/manage/segment")
-    public CommonResult<List<ManageSegmentDto>> segment() {
-        return CommonResult.success( manageService.segment() );
+    public CommonResult<List<ManageSegmentDto>> segment(String year) {
+        return CommonResult.success( manageService.segment(year) );
     }
 
     @GetMapping("/manage/person")
-    public CommonResult<List<ManagePersonDto>> person() {
-        return CommonResult.success( manageService.person() );
+    public CommonResult<List<ManagePersonDto>> person(String year) {
+        return CommonResult.success( manageService.person(year) );
     }
 
     @GetMapping("/manage/dept")
-    public CommonResult<List<ManageDeptDto>> dept() {
-        return CommonResult.success( manageService.dept() );
+    public CommonResult<List<ManageDeptDto>> dept(String year) {
+        return CommonResult.success( manageService.dept(year) );
     }
 }

zjugis-business/src/main/java/com/zjugis/business/excel/ContractConverter.java

@@ -37,10 +37,11 @@ public class ContractConverter implements Converter<Integer> {
     private final Map<Integer,String> yesOrNoDict = new HashMap<>();
 
     public ContractConverter() {
-        this.signWayDict.put(0,"立项申请中");
-        this.signWayDict.put(1,"进行中");
-        this.signWayDict.put(2,"已结项");
-        this.signWayDict.put(3,"已中止");
+        this.signWayDict.put(1,"跟单");
+        this.signWayDict.put(2,"半开拓");
+        this.signWayDict.put(3,"开拓");
+        this.signWayDict.put(4,"挂靠");
+        this.signWayDict.put(5,"计件");
 
         this.isSignDict.put(0,"未签");
         this.isSignDict.put(1,"已签");

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

@@ -449,14 +449,13 @@ public class UseMoneyEvent extends BaseController {
             String flowInstanceId = flowInstance.get("id").toString();
             UseMoneyDO entity = useMoneyService.findByInstanceId(flowInstanceId);
             Project project = projectService.selectById(entity.getProjectId());
-            String xmjlId = project.getXmjlId();
             String userId = entity.getUserId();
             List<PostRespDTO> postList = postApi.getPostByUser(userId).getCheckedData();
             Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
             List<DeptRespDTO> deptChildList = deptApi.getChildDeptList(entity.getDeptId()).getCheckedData();
             Set<String> depts = convertSet(deptChildList, DeptRespDTO::getId);
             depts.add(entity.getDeptId());
-            if (entity != null && CollectionUtil.contains(postCodes, "fgslz") && userId.equals(xmjlId) && CollectionUtil.contains(depts, project.getZrbmId()) && userId.equals(xmjlId)) {
+            if (entity != null && CollectionUtil.contains(postCodes, "fgslz") && CollectionUtil.contains(depts, project.getZrbmId())) {
                 return "true";
             }
             return "false";
@@ -849,14 +848,13 @@ public class UseMoneyEvent extends BaseController {
             String flowInstanceId = flowInstance.get("id").toString();
             UseMoneyDO entity = useMoneyService.findByInstanceId(flowInstanceId);
             Project project = projectService.selectById(entity.getProjectId());
-            String xmjlId = project.getXmjlId();
             String userId = entity.getUserId();
             List<PostRespDTO> postList = postApi.getPostByUser(userId).getCheckedData();
             Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
             List<DeptRespDTO> deptChildList = deptApi.getChildDeptList(entity.getDeptId()).getCheckedData();
             Set<String> depts = convertSet(deptChildList, DeptRespDTO::getId);
             depts.add(entity.getDeptId());
-            if (entity != null && CollectionUtil.contains(postCodes, "fgslz") && userId.equals(xmjlId) && !CollectionUtil.contains(depts, project.getZrbmId())) {
+            if (entity != null && CollectionUtil.contains(postCodes, "fgslz") && !CollectionUtil.contains(depts, project.getZrbmId())) {
                 return "true";
             }
             return "false";

zjugis-business/src/main/java/com/zjugis/business/service/ContractService.java

@@ -78,9 +78,9 @@ public interface ContractService{
 
     List<ContractExcelResponse> excelList(ContractDto contractDto);
 
-    List<ManageSegmentDto> infoGroupBySegment();
+    List<ManageSegmentDto> infoGroupBySegment(String year);
 
-    List<ManageDeptDto> infoGroupByDept();
+    List<ManageDeptDto> infoGroupByDept(String year);
 
-    List<ManagePersonDto> infoGroupByPerson();
+    List<ManagePersonDto> infoGroupByPerson(String year);
 }

zjugis-business/src/main/java/com/zjugis/business/service/ManageService.java

@@ -13,9 +13,9 @@ import java.util.List;
  */
 public interface ManageService {
 
-    List<ManageSegmentDto> segment();
+    List<ManageSegmentDto> segment(String year);
 
-    List<ManageDeptDto> dept();
+    List<ManageDeptDto> dept(String year);
 
-    List<ManagePersonDto> person();
+    List<ManagePersonDto> person(String year);
 }

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

@@ -1,5 +1,6 @@
 package com.zjugis.business.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -124,21 +125,26 @@ public class ContractServiceImpl implements ContractService{
         if(contract.getTaxHsjeTotal()!=null){
             contract.setContractAmount(contract.getTaxHsjeTotal());
         }
+
         int count =contractMapper.updateById(contract);
         Contract contract1=contractMapper.selectById(contract.getId());
         List<Contract> childList = contractMapper.selectList(new QueryWrapper<Contract>(){{
             eq("parent_id", contract.getId());
             eq("contract_type", 4);
         }});
-        for(Contract child: childList){
-            child.setContractOff(contract.getContractOff());
+
+        if(childList.size()>0){
+            for(Contract child: childList){
+                child.setContractOff(contract.getContractOff());
+            }
+            contractMapper.updateBatch(childList);
         }
-        contractMapper.updateBatch(childList);
         ProjectAmount projectAmounts = projectAmountService.selectById(contract1.getProjectId());
         //更新PROJECT_AMOUNT表
         ProjectAmount projectAmount=new ProjectAmount();
         projectAmount.setProjectId(contract1.getProjectId());
-        projectAmount.setContractAmount(contractMapper.getSumContractById(contract1.getProjectId()));
+        BigDecimal contractAmount = contractMapper.getSumContractById(contract1.getProjectId());
+        projectAmount.setContractAmount(contractAmount);
         projectAmount.setContractBalance(projectAmount.getContractAmount().subtract(projectAmounts.getReceivableAmount()).subtract(projectAmounts.getReturnAmount()));
         projectAmount.setUpdateTime(LocalDateTime.now());
         projectAmountMapper.updateById(projectAmount);
@@ -156,6 +162,12 @@ public class ContractServiceImpl implements ContractService{
                 projectAmount2.setProjectId(contract1.getProjectId());
                 projectAmount2.setVirtualAmount(child);
                 projectAmountMapper.updateById(projectAmount2);
+            } else {
+                //将虚拟合同额设置成合同额一样
+                contract.setVirtualAmount(contract.getContractAmount());
+                contractMapper.updateById(contract);
+                projectAmount.setVirtualAmount(contractAmount);
+                projectAmountMapper.updateById(projectAmount);
             }
         }
         return count;
@@ -297,13 +309,17 @@ public class ContractServiceImpl implements ContractService{
         resp.setSubToPay(subToPayDto.getSubToPay());
         resp.setOutToPay(subToPayDto.getOutToPay());
         ContractInfoResp cost =  projectAmountService.selectCostSum(projectAmountDto);
-        resp.setPaymentCost(cost.getPaymentCost());
-        resp.setReimbursementCost(cost.getReimbursementCost());
-        resp.setTravelCost(cost.getTravelCost());
+        if(ObjectUtil.isNotNull(cost)){
+            resp.setPaymentCost(cost.getPaymentCost());
+            resp.setReimbursementCost(cost.getReimbursementCost());
+            resp.setTravelCost(cost.getTravelCost());
+        }
         UseMoneyDeptRespVO paymentCost = useMoneyService.getDataByDeptId(new ArrayList<>(deptPermissions.getDeptIds()));
         BigDecimal commonCost = commonCostService.getPaymentCost(infoRequest.getYear(), deptPermissions.getDeptIds());
         BigDecimal travelCost = travelCostService.getTravelCost(infoRequest.getYear(), deptPermissions.getDeptIds());
-        resp.setPaymentCost(paymentCost.getAmount());
+        if(ObjectUtil.isNotNull(paymentCost)){
+            resp.setPaymentCost(paymentCost.getAmount());
+        }
         resp.setTravelCost(travelCost);
         resp.setReimbursementCost(commonCost);
         return resp;
@@ -404,9 +420,11 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<ManageSegmentDto> infoGroupBySegment() {
-        Calendar calendar = Calendar.getInstance();
-        String year = String.valueOf(calendar.get(Calendar.YEAR));
+    public List<ManageSegmentDto> infoGroupBySegment(String year) {
+        if(StringUtils.isBlank(year)) {
+            Calendar calendar = Calendar.getInstance();
+            year = String.valueOf(calendar.get(Calendar.YEAR));
+        }
         List<ManageSegmentDto> returnDtos = contractMapper.returnGroupBySegment(year);
         List<ManageSegmentDto> signDtos = contractMapper.signGroupBySegment(year);
         List<ManageSegmentDto> newDtos = contractMapper.newGroupBySegment(year);
@@ -432,9 +450,11 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<ManageDeptDto> infoGroupByDept() {
-        Calendar calendar = Calendar.getInstance();
-        String year = String.valueOf(calendar.get(Calendar.YEAR));
+    public List<ManageDeptDto> infoGroupByDept(String year) {
+        if(StringUtils.isBlank(year)) {
+            Calendar calendar = Calendar.getInstance();
+            year = String.valueOf(calendar.get(Calendar.YEAR));
+        }
         List<ManageDeptDto> returnDtos = contractMapper.returnGroupByDept(year);
         List<ManageDeptDto> signDtos = contractMapper.signGroupByDept(year);
         List<ManageDeptDto> newDtos = contractMapper.newGroupByDept(year);
@@ -460,9 +480,11 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<ManagePersonDto> infoGroupByPerson() {
-        Calendar calendar = Calendar.getInstance();
-        String year = String.valueOf(calendar.get(Calendar.YEAR));
+    public List<ManagePersonDto> infoGroupByPerson(String year) {
+        if(StringUtils.isBlank(year)) {
+            Calendar calendar = Calendar.getInstance();
+            year = String.valueOf(calendar.get(Calendar.YEAR));
+        }
         List<ManagePersonDto> manageDtos = contractMapper.signGroupByPerson(year);
         List<ManagePersonDto> returnDtos = contractMapper.returnGroupByPerson(year);
         List<ManagePersonDto> newDtos = contractMapper.newGroupByPerson(year);

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

@@ -29,8 +29,8 @@ public class ManageServiceImpl implements ManageService {
 
 
     @Override
-    public List<ManageSegmentDto> segment() {
-        List<ManageSegmentDto> manageDtos = contractService.infoGroupBySegment();
+    public List<ManageSegmentDto> segment(String year) {
+        List<ManageSegmentDto> manageDtos = contractService.infoGroupBySegment(year);
         List<ManageSegmentDto> subDtos = contractApplyService.infoGroupBySegment();
         for (ManageSegmentDto manageDto : manageDtos) {
             for (ManageSegmentDto subDto : subDtos) {
@@ -45,14 +45,14 @@ public class ManageServiceImpl implements ManageService {
     }
 
     @Override
-    public List<ManageDeptDto> dept() {
-        List<ManageDeptDto> manageDtos = contractService.infoGroupByDept();
+    public List<ManageDeptDto> dept(String year) {
+        List<ManageDeptDto> manageDtos = contractService.infoGroupByDept(year);
         return manageDtos;
     }
 
     @Override
-    public List<ManagePersonDto> person() {
-        List<ManagePersonDto> manageDtos = contractService.infoGroupByPerson();
+    public List<ManagePersonDto> person(String year) {
+        List<ManagePersonDto> manageDtos = contractService.infoGroupByPerson(year);
         return manageDtos;
     }
 }