Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -384,4 +384,8 @@ public class CwProjectReportData extends BaseDTO {
      */
     private String remark3;
 
+    /**
+     * 财务-报告编号
+     */
+    private String reportReviewNo;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReview.java

@@ -12,6 +12,21 @@ import lombok.Data;
 @TableName(value = "cw_project_report_review")
 public class CwProjectReview extends BaseEntity {
 
+    //报告编号基字（字典值）
+    public static final String BIZ_CODE1 = "23";
+
+    //报告编号咨字（字典值）
+    public static final String BIZ_CODE2 = "24";
+
+    //报告编号审字（字典值）
+    public static final String BIZ_CODE3 = "25";
+
+    //报告编号验字（字典值）
+    public static final String BIZ_CODE4 = "26";
+
+    //报告编号特字（字典值）
+    public static final String BIZ_CODE5 = "27";
+
     /**
      * 流程id
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportReviewService.java

@@ -108,16 +108,17 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         review.setUpdateBy(userDTO.getId());
         review.setUpdateDate(new Date());
         review.setId(id);
-        FlowNode currentTask = flowTaskService.getCurrentTask(procInsId);
-        if(null != currentTask && StringUtils.isNotBlank(currentTask.getName())) {
-            if ("三级复核".equals(currentTask.getName())) {
-                review.setReviewStatus("5");
+        if (StringUtils.isNotEmpty(procInsId)) {
+            FlowNode currentTask = flowTaskService.getCurrentTask(procInsId);
+            if(null != currentTask && StringUtils.isNotBlank(currentTask.getName())) {
+                if ("三级复核".equals(currentTask.getName())) {
+                    review.setReviewStatus("5");
+                }
             }
         }
         if (review.getReviewStatus().equals("5")) {
             CwProjectReport cwProjectReport = cwProjectReportService.getById(reportData.getId());
             CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
-            //要判断是否有数据
             cwProjectReportArchive.setStatus("0");
             cwProjectReportArchive.setReportId(review.getReportId());
             cwProjectReportArchive.setCreateBy(cwProjectReport.getCreateBy());
@@ -148,6 +149,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         //保存基本信息
         CwProjectReview info = new CwProjectReview();
         BeanUtils.copyProperties(dto, info);
+        //报告编号生成
         info.setId(id);
         info.setCreateBy(userDTO.getId());
         info.setCreateDate(new Date());