调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -1055,9 +1055,9 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                     }
                 } else {//开票金额不为0的状态
                     int indexFlag = 0;
-                    int baseAccountFlag = 0;
                     //创建发票集合
                     List<String> invoiceNumber = Lists.newArrayList();
+                    BigDecimal allMoneyB = new BigDecimal(0);
                     for (CwFinanceInvoiceDTO invoiceDTO : mapList) {
                         indexFlag ++ ;
                         //开票金额
@@ -1067,21 +1067,15 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                         //项目开票金额
                         BigDecimal baseAccountB = new BigDecimal(invoiceDTO.getBaseAccount());
 
-                        if((baseAccountB.compareTo(accountB) < 0 && baseAccountB.compareTo(accountDetailB) < 0)) {
-
-                        } else if (baseAccountB.compareTo(accountB) == 0) {
-                            if(baseAccountFlag>0){
-                                invoiceDTO.setBaseAccount("0");
-                            }
-                            baseAccountFlag ++ ;
-                        } else if (accountB.compareTo(accountDetailB) < 0) {
-                            invoiceDTO.setBaseAccount(invoiceDTO.getAccount());
-                        } else if(accountDetailB.compareTo(accountB) < 0){
-                            invoiceDTO.setBaseAccount(invoiceDTO.getAccountDetail());
+                        if(allMoneyB.compareTo(accountB) == 0){
+                            invoiceDTO.setBaseAccount("0");
+                        }else{
+                            allMoneyB = allMoneyB.add(baseAccountB);
                         }
 
+                        //将发票号进行汇总并转换成字符串
                         String invoiceNumberStr = String.join(", ", invoiceNumber);
-
+                        //如果 遍历行不是第一行，则需要将总开票费用填写为0 且需要判定当前行的发票号是否已经存在于发票汇总中，若存在，则表示发票金额已经录入，则不需要重复添加，给予默认值0
                         if(indexFlag>1){
                             invoiceDTO.setAccount("0");
                             if(invoiceNumberStr.contains(invoiceDTO.getNumber())){

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -637,11 +637,14 @@ public class FlowableTaskController {
             if (entry.getKey().startsWith("vars.")) {
                 String key = entry.getKey().substring(5);
                 String value = entry.getValue()[0];
-                if ("true".equals(value) || "false".equals(value)) {
-                    vars.put(key, Boolean.valueOf(value).booleanValue());
-                } else {
-                    vars.put(key, value);
+                if("agree".equals(key)){
+                    if ("true".equals(value) || "false".equals(value)) {
+                        vars.put(key, Boolean.valueOf(value).booleanValue());
+                    } else {
+                        vars.put(key, value);
+                    }
                 }
+
             }
         }
 

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentRegistrationController.java

@@ -19,7 +19,6 @@ import com.jeeplus.human.depart.handover.service.HandoverService;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.UserTemplate;
-import com.jeeplus.human.enrollment.enrollmentRegistration.utils.EasyPoiUtil;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.HunamFreemarkerUtil;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.IdCardUtil;
 import com.jeeplus.human.practice.register.domain.Registration;
@@ -560,7 +559,7 @@ public class EnrollmentRegistrationController {
     /**
      * 导入用户数据
      */
-    @PostMapping("import")
+    /*@PostMapping("import")
     @ApiOperation(value = "导入用户excel")
     public ResponseEntity importDetail(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
         List<EnrollmentRegistration> dtoArrayList = new ArrayList<>();
@@ -610,7 +609,7 @@ public class EnrollmentRegistrationController {
         return ResponseEntity.ok("导入成功");
 
 
-    }
+    }*/
 
 
     /**