更新

src/main/java/org/jeecg/modules/payment/service/impl/ManagerPaymentAndReceiptSlipServiceImpl.java

@@ -209,23 +209,23 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
             if(!CollectionUtils.isEmpty(businessList)){
                 for(ProjectManageArchivesAndBusiness business : businessList){
                     if(business.getMilestone1().equals(content.getProArchivesMilestone())){
-                        business.setPrice1(BigDecimal.ZERO);
+                        business.setDesc1(BigDecimal.ZERO.toPlainString());
                         projectManageArchivesAndBusinessService.updateById(business);
                     }
                     if(business.getMilestone2().equals(content.getProArchivesMilestone())){
-                        business.setPrice2(BigDecimal.ZERO);
+                        business.setDesc2(BigDecimal.ZERO.toPlainString());
                         projectManageArchivesAndBusinessService.updateById(business);
                     }
                     if(business.getMilestone3().equals(content.getProArchivesMilestone())){
-                        business.setPrice3(BigDecimal.ZERO);
+                        business.setDesc3(BigDecimal.ZERO.toPlainString());
                         projectManageArchivesAndBusinessService.updateById(business);
                     }
                     if(business.getMilestone4().equals(content.getProArchivesMilestone())){
-                        business.setPrice4(BigDecimal.ZERO);
+                        business.setDesc4(BigDecimal.ZERO.toPlainString());
                         projectManageArchivesAndBusinessService.updateById(business);
                     }
                     if(business.getMilestone5().equals(content.getProArchivesMilestone())){
-                        business.setPrice5(BigDecimal.ZERO);
+                        business.setDesc5(BigDecimal.ZERO.toPlainString());
                         projectManageArchivesAndBusinessService.updateById(business);
                     }
 
@@ -269,23 +269,23 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
         if(!CollectionUtils.isEmpty(businesses)){
             for(ProjectManageArchivesAndBusiness business : businesses){
                 if(business.getMilestone1().equals(reqDTO.getProArchivesMilestone())){
-                    business.setPrice1(reqDTO.getCoPrvice());
+                    business.setDesc1(reqDTO.getCoPrvice().toPlainString());
                     projectManageArchivesAndBusinessService.updateById(business);
                 }
                 if(business.getMilestone2().equals(reqDTO.getProArchivesMilestone())){
-                    business.setPrice2(reqDTO.getCoPrvice());
+                    business.setDesc2(reqDTO.getCoPrvice().toPlainString());
                     projectManageArchivesAndBusinessService.updateById(business);
                 }
                 if(business.getMilestone3().equals(reqDTO.getProArchivesMilestone())){
-                    business.setPrice3(reqDTO.getCoPrvice());
+                    business.setDesc3(reqDTO.getCoPrvice().toPlainString());
                     projectManageArchivesAndBusinessService.updateById(business);
                 }
                 if(business.getMilestone4().equals(reqDTO.getProArchivesMilestone())){
-                    business.setPrice4(reqDTO.getCoPrvice());
+                    business.setDesc4(reqDTO.getCoPrvice().toPlainString());
                     projectManageArchivesAndBusinessService.updateById(business);
                 }
                 if(business.getMilestone5().equals(reqDTO.getProArchivesMilestone())){
-                    business.setPrice5(reqDTO.getCoPrvice());
+                    business.setDesc5(reqDTO.getCoPrvice().toPlainString());
                     projectManageArchivesAndBusinessService.updateById(business);
                 }
 

src/main/java/org/jeecg/modules/report/service/impl/ProReportServiceImpl.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.report.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiModel;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.dto.invoice.PurchaseDataDTO;
 import org.jeecg.common.dto.payment.SlipAllListDTO;
@@ -29,7 +28,6 @@ import org.jeecg.modules.prowork.entity.ProWorkMilestone;
 import org.jeecg.modules.prowork.service.ProWorkLogicService;
 import org.jeecg.modules.prowork.service.ProWorkMilestoneService;
 import org.jeecg.modules.report.entity.ChoosePlanTypeEnum;
-import org.jeecg.modules.report.entity.MeberDepartEnum;
 import org.jeecg.modules.report.mapper.ProReportMapper;
 import org.jeecg.modules.report.service.ProReportService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -275,7 +273,6 @@ public class ProReportServiceImpl implements ProReportService {
 
 
     //配置计划信息表的数据
-
     private void setThreeChildren(ProStatisticsTwoRespDTO twoRespDTO, List<ProjectManageBusinessOther> otherList, int i,
          Map<String, List<ProWorkLogic>> logicMap, Map<String, List<ProWorkMilestone>> milestoneMap, Map<String, List<PurchaseDataDTO>> purchaseDataMap,
           Map<String, List<SlipAllListDTO>> slipMap) {