feat: 企标制修订流程增加无意见选项

db/prod/2024-3-18-变更.sql

@@ -227,4 +227,8 @@ ALTER TABLE `laws_answer_library`
 
 -- 2024-09-03 问答库回答加长字段
 ALTER TABLE `laws_answer_library`
-    MODIFY COLUMN `answer_description` longtext NULL COMMENT '答案描述' AFTER `problem_id`;
+    MODIFY COLUMN `answer_description` longtext NULL COMMENT '答案描述' AFTER `problem_id`;
+
+-- 2024-09-04 意见增加有无意见字段
+ALTER TABLE `process_es_revision_advice`
+    ADD COLUMN `have_no_opinion` varchar(1) NULL DEFAULT '1' COMMENT '是否有意见 0没有 1有';

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/EsRevisionAdvice.java

@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 
  * @TableName process_es_revision_advice
@@ -103,6 +103,13 @@ public class EsRevisionAdvice implements Serializable {
     @Dict(dicCode = "consultation_opinion")
     private String handleAdvice;
 
+    /**
+     * 0无意见 1有意见
+     */
+    @ApiModelProperty(value = "0无意见 1有意见")
+    @Dict(dicCode = "yn")
+    private String haveNoOpinion;
+
     /**
      * 理由
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java

@@ -330,6 +330,14 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "自动发起标识")
     private boolean autoStartFlag;
 
+    /**
+     * 0无意见 1有意见
+     */
+    @ApiModelProperty(value = "0无意见 1有意见")
+    @TableField(exist = false)
+    @Dict(dicCode = "yn")
+    private String haveNoOpinion;
+
     public void setOtherDrafterUploadFileJson(String otherDrafterUploadFileJson) {
         this.otherDrafterUploadFileJson = otherDrafterUploadFileJson;
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java

@@ -539,11 +539,22 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case ADVICE:
                 data = revisionData.getData();
+                String haveNoOpinion = data.getHaveNoOpinion();
                 advices = data.getAdvices();
-                advices.forEach(advice -> advice.setCreateUserId(userId));
+                if (YesOrNoEnum.NO.getValue().equals(data.getHaveNoOpinion())) {
-                advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
+                    EsRevisionAdvice advice = new EsRevisionAdvice();
+                    advice.setClauseName("无");
+                    advice.setClauseNum("无");
+                    advice.setEditAdvice("无");
+                    advices = new ArrayList<>(Collections.singletonList(advice));
+                }
                 String contactUserExecutionId = (String) runtimeService.getVariable(executionId, executionId + "-ContactExecutionId");
-                advices.forEach(advice -> advice.setExecutionId(contactUserExecutionId));
+                advices.forEach(advice -> {
+                    advice.setCreateUserId(userId);
+                    advice.setProcessInstanceId(processInstanceId);
+                    advice.setExecutionId(contactUserExecutionId);
+                    advice.setHaveNoOpinion(haveNoOpinion);
+                });
                 adviceService.saveBatch(advices);
                 break;
             case CONTACT_USER_COLLECT: