ci: 企标计划字段修改

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java

@@ -64,11 +64,7 @@ public class ProcessESInitChangeController {
     @PostMapping("/save")
     public Result<?> saveToWait(@RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestBody List<ProcessEsInitChange> esInitChangeList) {
-        if (StrUtil.isBlank(taskId)) {
+        initChangeService.saveToDraft(taskId, esInitChangeList);
-            initChangeService.saveToDraft(esInitChangeList);
-        } else {
-            initChangeService.saveToWait(taskId, esInitChangeList);
-        }
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java

@@ -34,17 +34,12 @@ public interface ProcessEsInitChangeService extends IService<ProcessEsInitChange
     void approvalInitChange(String taskId, List<ProcessEsInitChange> esInitChange, boolean pass);
 
     /**
-     * 保存到待办
+     * 保存到草稿
+     *
      * @param taskId
      * @param esInitChange
      */
-    void saveToWait(String taskId, List<ProcessEsInitChange> esInitChange);
+    void saveToDraft(String taskId, List<ProcessEsInitChange> esInitChange);
-
-    /**
-     * 保存到草稿
-     * @param esInitChange
-     */
-    void saveToDraft(List<ProcessEsInitChange> esInitChange);
 
     /**
      * 软删除实例数据

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -158,16 +158,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     }
 
     @Override
-    public void saveToWait(String taskId, List<ProcessEsInitChange> esInitChangeList) {
+    public void saveToDraft(String taskId, List<ProcessEsInitChange> esInitChange) {
-        // 检查任务是否存在
-        if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
-        }
-        saveOrUpdateBatch(esInitChangeList);
-    }
-
-    @Override
-    public void saveToDraft(List<ProcessEsInitChange> esInitChange) {
         saveOrUpdateBatch(esInitChange);
         // 先删后增
         LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java

@@ -155,23 +155,27 @@ public class EnterpriseStandardPlan implements Serializable {
 
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
-
-    @ApiModelProperty(value = "主起草人Id")
     @TableField(exist = false)
-    private String mainDraftingUserId;
+    @ApiModelProperty(value = "主起草人用户名")
-
+    private String mainDraftingUser_dictText;
-    @ApiModelProperty(value = "主起草单位")
-    private String mainDraftingUnit;
 
     @ApiModelProperty(value = "主起草单位Id")
+    private String mainDraftingUnit;
+    @ApiModelProperty(value = "主起草单位")
     @TableField(exist = false)
-    private String mainDraftingUnitId;
+    private String mainDraftingUnit_dictText;
 
-    @ApiModelProperty(value = "主起草单位责任人")
+    @ApiModelProperty(value = "主起草单位责任人Id")
     private String mainDraftingUnitResponsiblePerson;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "主起草单位责任人用户名")
+    private String mainDraftingUnitResponsiblePerson_dictText;
 
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准推进人")
+    private String standardPromoter_dictText;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java

@@ -57,22 +57,34 @@ public class EnterpriseStandardPlanVo {
     @ApiModelProperty(value = "配合单位")
     private String cooperateDeparts;
 
-    @Excel(name = "主起草人", width = 15, orderNum = "1")
+    @ApiModelProperty(value = "主起草人Id")
-    @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
-    @Excel(name = "主起草单位", width = 15, orderNum = "1")
+    @Excel(name = "主起草人", width = 15, orderNum = "1")
-    @ApiModelProperty(value = "主起草单位")
+    @ApiModelProperty(value = "主起草人用户名")
+    private String mainDraftingUser_dictText;
+
+    @ApiModelProperty(value = "主起草单位Id")
     private String mainDraftingUnit;
 
-    @Excel(name = "主起草单位责任人", width = 15, orderNum = "1")
+    @Excel(name = "主起草单位", width = 15, orderNum = "1")
+    @ApiModelProperty(value = "主起草单位名")
+    private String mainDraftingUnit_dictText;
+
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
-    @Excel(name = "标准推进人", width = 15, orderNum = "1")
+    @Excel(name = "主起草单位责任人", width = 15, orderNum = "1")
-    @ApiModelProperty(value = "标准推进人")
+    @ApiModelProperty(value = "主起草单位责任人用户名")
+    private String mainDraftingUnitResponsiblePerson_dictText;
+
+    @ApiModelProperty(value = "标准推进人Id")
     private String standardPromoter;
 
+    @Excel(name = "标准推进人", width = 15, orderNum = "1")
+    @ApiModelProperty(value = "标准推进人用户名")
+    private String standardPromoter_dictText;
+
     @Excel(name = "草稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml

@@ -90,10 +90,14 @@
             ad.authDeparts,
             p.en_standard_code,
             cu.cooperateDeparts,
-            u1.realname AS mainDraftingUser,
+            u1.id AS mainDraftingUser,
-            d.depart_name AS mainDraftingUnit,
+            u1.username AS mainDraftingUser_dictText,
-            u2.realname AS mainDraftingUnitResponsiblePerson,
+            d.id AS mainDraftingUnit,
-            u3.realname AS standardPromoter,
+            d.depart_name AS mainDraftingUnit_dictText,
+            u2.id AS mainDraftingUnitResponsiblePerson,
+            u2.username AS mainDraftingUnitResponsiblePerson_dictText,
+            u3.id AS standardPromoter,
+            u3.username AS standardPromoter_dictText,
             p.draft_planned_complete_date,
             p.solicitation_draft_plan_complete_date,
             p.plan_approval_date,
@@ -228,12 +232,16 @@
             p.compilation_description,
             o1.file_name AS compilationFileName,
             p.component_name,
-            u1.id as mainDraftingUserId,
+#             u1.id as mainDraftingUserId,
-            u1.username as mainDraftingUser,
+            u1.id as mainDraftingUser,
-            d.id as mainDraftingUnitId,
+            u1.username as mainDraftingUser_dictText,
-            d.depart_name as mainDraftingUnit,
+#             d.id as mainDraftingUnitId,
-            u2.username as mainDraftingUnitResponsiblePerson,
+            d.id as mainDraftingUnit,
-            u3.username as promoter,
+            d.depart_name as mainDraftingUnit_dictText,
+            u2.id as mainDraftingUnitResponsiblePerson,
+            u2.username as mainDraftingUnitResponsiblePerson_dictText,
+            u3.id as promoter,
+            u3.username as promoter_dictText,
             p.draft_completion_date,
             p.draft_submission_date,
             p.solicitation_opinion_enabled,