增加审核通过状态

src/main/java/com/keymobile/indicators/constant/Constants.java

@@ -83,6 +83,11 @@ public class Constants {
     public static final int APPLY_STATE_PASSED = 3;
 
     /**
+     * 申请状态-确认通过
+     */
+    public static final int APPLY_STATE_OK_PASSED = 4;
+
+    /**
      * 申请状态-已拒绝
      */
     public static final int APPLY_STATE_REJECTED = 4;

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskAuditResult.java

@@ -14,8 +14,8 @@ public class TaskAuditResult {
     @ApiModelProperty("审批的任务id")
     private String taskId;
 
-    @ApiModelProperty("审批结果：true 通过 false 驳回")
-    private boolean result = true;
+    @ApiModelProperty("审批结果：1 审核通过 2 驳回 3 确认通过")
+    private int result;
 
     @ApiModelProperty("审批结果意见描述")
     private String description;

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -379,9 +379,14 @@ public class TaskServiceImpl implements TaskService {
         task.setUpdateTime(now);
         int status = Constants.APPLY_STATE_DRAFT;
         String recordType = "审批拒绝";
-        if (auditResult.isResult()) {
+        //审核通过
+        if(auditResult.getResult()==1){
             status = Constants.APPLY_STATE_PASSED;
             recordType = "审批通过";
+        }else if (auditResult.getResult()==3) {
+            //确认通过（基础项插入数据库）
+            status = Constants.APPLY_STATE_OK_PASSED;
+            recordType = "确认通过";
             List<IndicatorsData> datas = createCountIndValues(task);
             if (CollectionUtils.isNotEmpty(datas)) {
                 this.baseIndDataService.batchInsertData(datas);