修复项目编码为NULL导致的项目无法创建BUG

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -433,34 +433,35 @@ public class ReportController {
                 return msg;
             } else {
                 auditorSettingList = new ArrayList<>();
+                projectAuditorId = new String[auditorSettingArray.length];
                 for (int i=0;i<auditorSettingArray.length; i++) {
                     String str = auditorSettingArray[i];
                     if (str.contains("@")) {
                         str = str.replaceAll("@", ",");
                     }
                     ReportAuditorSetting reportAuditorSetting = JSONObject.parseObject(str, ReportAuditorSetting.class);
+                    //避免字段为空字符串
+                    if ("".equals(reportAuditorSetting.getAuditorFirst())) {
+                        reportAuditorSetting.setAuditorFirst(null);
+                    }
+                    if ("".equals(reportAuditorSetting.getAuditorSec())) {
+                        reportAuditorSetting.setAuditorSec(null);
+                    }
+                    if ("".equals(reportAuditorSetting.getAuditorThird())) {
+                        reportAuditorSetting.setAuditorThird(null);
+                    }
+
                     auditorSettingList.add(reportAuditorSetting);
                     //检查审核人层级是否设置满
-                    if (comTimeType.getAuditLevel() == 1 && reportAuditorSetting.getAuditorFirst() == null) {
-                        HttpRespMsg msg = new HttpRespMsg();
-                        //msg.setError("请设置审核人");
-                        msg.setError(MessageUtils.message("profession.checker"));
-                        return msg;
-                    } else if (comTimeType.getAuditLevel() == 2 && (reportAuditorSetting.getAuditorFirst() == null || reportAuditorSetting.getAuditorSec() == null)) {
-                        HttpRespMsg msg = new HttpRespMsg();
-                        //msg.setError("请设置审核人");
-                        msg.setError(MessageUtils.message("profession.checker"));
-                        return msg;
-                    }else if (comTimeType.getAuditLevel() == 3 && (reportAuditorSetting.getAuditorFirst() == null || reportAuditorSetting.getAuditorSec() == null
-                                                                    || reportAuditorSetting.getAuditorThird() == null)) {
+                    if (reportAuditorSetting.getAuditorFirst() == null) {
                         HttpRespMsg msg = new HttpRespMsg();
                         //msg.setError("请设置审核人");
-                        msg.setError(MessageUtils.message("profession.checker"));
+                        msg.setError("请至少设置第一审核人");
                         return msg;
                     }
                     //设置审核人为第一审核人
-                    projectAuditorId = new String[auditorSettingArray.length];
                     projectAuditorId[i] = reportAuditorSetting.getAuditorFirst();
+                    System.out.println("第"+(i+1)+"个项目的第一审核人是:" +projectAuditorId[i]);
                 }
             }
         }else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCorpwxTimeController.java

@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -368,6 +369,7 @@ public class UserCorpwxTimeController {
 
         //数据填充
         DecimalFormat decimalFormat = new DecimalFormat("#0.0%");
+        decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
         for (Map dataItem : list) {
             List<String> dataList = new ArrayList<>();
             dataList.add(ymonth);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -385,9 +385,11 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
         stringBuilder.append("$userName="+auditor.getCorpwxUserid()+"$")
                 .append(sheet.getStatus() == 0?"通过":"驳回")
-                .append("了您")
-                .append(dateTimeFormatter.format(sheet.getCreateDate()))
-                .append("的费用报销申请。");
+                .append("了您");
+        if (sheet.getCreateDate() != null) {
+            stringBuilder.append("于").append(dateTimeFormatter.format(sheet.getCreateDate()));
+        }
+        stringBuilder.append("的费用报销申请。");
         if (sheet.getStatus() == 2) {
             //驳回加原因
             stringBuilder.append("原因: ").append(denyReason);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -771,7 +771,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     oldInchargerId = project.getInchargerId();
                 }
                 Project p = new Project();
-                p.setProjectName(name).setId(id).setCompanyId(companyId).setProjectCode(code.trim()).setInchargerId(inchargerId)
+                p.setProjectName(name).setId(id).setCompanyId(companyId).setProjectCode(code != null?code.trim():null).setInchargerId(inchargerId)
                         .setLevel(level)
                         .setIsPublic(isPublic)
                         .setContractAmount(contractAmount)

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1597,7 +1597,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 updateBatchById(reportList);
             } else if (timeType.getReportAuditType() == 3) {
                 //员工自由选择的审批人
-                String auditorId = user.getId();
                 List<ReportAuditorSetting> auditorSettingList = reportAuditorSettingMapper.selectList(new QueryWrapper<ReportAuditorSetting>().in("report_id", ids));
                 List<Report> updateReportList = new ArrayList<>();
                 List<ReportAuditorSetting> updateReportAuditorSettingList = new ArrayList<>();