From b4b569da58f4e1b3b8652967269ae7da019aef2d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Oct 2023 17:57:35 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessESInitChangeController.java | 6 +--- .../service/ProcessEsInitChangeService.java | 11 ++------ .../impl/ProcessEsInitChangeServiceImpl.java | 11 +------- .../entity/EnterpriseStandardPlan.java | 20 +++++++------ .../entity/vo/EnterpriseStandardPlanVo.java | 26 ++++++++++++----- .../xml/EnterpriseStandardPlanMapper.xml | 28 ++++++++++++------- 6 files changed, 54 insertions(+), 48 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index 5a5c7b0d..489296a5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/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 esInitChangeList) { - if (StrUtil.isBlank(taskId)) { - initChangeService.saveToDraft(esInitChangeList); - } else { - initChangeService.saveToWait(taskId, esInitChangeList); - } + initChangeService.saveToDraft(taskId, esInitChangeList); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java index b3484bcf..d3d83836 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java @@ -34,17 +34,12 @@ public interface ProcessEsInitChangeService extends IService esInitChange, boolean pass); /** - * 保存到待办 + * 保存到草稿 + * * @param taskId * @param esInitChange */ - void saveToWait(String taskId, List esInitChange); - - /** - * 保存到草稿 - * @param esInitChange - */ - void saveToDraft(List esInitChange); + void saveToDraft(String taskId, List esInitChange); /** * 软删除实例数据 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index a3cff800..01445e59 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -158,16 +158,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl esInitChangeList) { - // 检查任务是否存在 - if (!actFlowCommonService.taskExists(taskId)) { - throw new JeroBootException("任务不存在"); - } - saveOrUpdateBatch(esInitChangeList); - } - - @Override - public void saveToDraft(List esInitChange) { + public void saveToDraft(String taskId, List esInitChange) { saveOrUpdateBatch(esInitChange); // 先删后增 LambdaUpdateWrapper draftWrapper = new LambdaUpdateWrapper<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java index 36ba9028..8ec5e517 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java +++ b/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 mainDraftingUnit; + @ApiModelProperty(value = "主起草人用户名") + private String mainDraftingUser_dictText; @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") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index cc52ce18..2d17d147 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/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 = "主起草人") + @ApiModelProperty(value = "主起草人Id") private String mainDraftingUser; - @Excel(name = "主起草单位", width = 15, orderNum = "1") - @ApiModelProperty(value = "主起草单位") + @Excel(name = "主起草人", width = 15, orderNum = "1") + @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") - @ApiModelProperty(value = "标准推进人") + @Excel(name = "主起草单位责任人", width = 15, orderNum = "1") + @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") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index d1b0cf70..75fe8ea4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/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, - d.depart_name AS mainDraftingUnit, - u2.realname AS mainDraftingUnitResponsiblePerson, - u3.realname AS standardPromoter, + u1.id AS mainDraftingUser, + u1.username AS mainDraftingUser_dictText, + d.id AS mainDraftingUnit, + 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.username as mainDraftingUser, - d.id as mainDraftingUnitId, - d.depart_name as mainDraftingUnit, - u2.username as mainDraftingUnitResponsiblePerson, - u3.username as promoter, +# u1.id as mainDraftingUserId, + u1.id as mainDraftingUser, + u1.username as mainDraftingUser_dictText, +# d.id as mainDraftingUnitId, + d.id as mainDraftingUnit, + 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,