From c457a91c50955feef91dd6e3d947840ed1e9babf Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 12 Oct 2023 18:30:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=89=E6=8B=A9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B8=A6=E5=87=BA=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessESInitChangeController.java | 16 ++++++++++++++++ .../entity/EnterpriseStandardPlan.java | 8 ++++++++ .../mapper/xml/EnterpriseStandardPlanMapper.xml | 2 ++ 3 files changed, 26 insertions(+) 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 ae6173d1..e3c0bcf7 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 @@ -6,6 +6,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,6 +33,9 @@ public class ProcessESInitChangeController { @Resource private EnterpriseStandardUtil esUtil; + @Resource + private EnterpriseStandardPlanService espService; + /** * 生成企标编号并返回 * @param esInitChange @@ -122,4 +126,16 @@ public class ProcessESInitChangeController { initChangeService.transfer(taskId, userId); return Result.OK(); } + + /** + * 选择企标编号带出数据 + * + * @param espId + */ + @AutoLog(value = "企标立项变更流程-选择企标编号带出数据") + @ApiOperation(value="企标立项变更流程-选择企标编号带出数据", notes="企标立项变更流程-选择企标编号带出数据") + @PostMapping(value = "/getESPInfo") + public Result getESPInfo(@RequestParam("id") String espId) { + return Result.OK(espService.getDetailById(espId)); + } } 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 250f815d..36ba9028 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 @@ -156,9 +156,17 @@ 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 = "主起草单位Id") + @TableField(exist = false) + private String mainDraftingUnitId; + @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; 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 57c20c5e..367a9ad3 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 @@ -218,7 +218,9 @@ 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,