From 514e033342634056368eace2a1936e2d46bbbf40 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jan 2024 17:00:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectStandardController.java | 18 ++++++++++-------- .../ProcessProjectStandardTermApproval.java | 4 ++++ .../service/ProcessProjectStandardService.java | 6 ++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java index d2703cb2..9e94e24e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java @@ -9,11 +9,13 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; import javax.servlet.http.HttpServletRequest; +import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermApprovalService; import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermUserService; import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO; import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; @@ -124,7 +126,7 @@ public class ProcessProjectStandardController extends JeroController> getTermUserList(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - IPage page = processProjectStandardService.getTermUserList(processProjectStandardTermUser, pageNo, pageSize, req); + @DictPoint + @AutoLog(value = "法规合规评估流程-查询立项结果列表") + @ApiOperation(value = "查询立项结果列表") + @GetMapping("/getTermApprovalList") + public Result> getTermApprovalList(@RequestParam(name="id") String id) { + List page = processProjectStandardService.getTermApprovalList(id); return Result.OK(page); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java index 6f185ecc..99fbb9b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java @@ -4,6 +4,7 @@ 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 com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -80,6 +81,7 @@ public class ProcessProjectStandardTermApproval { /** * 责任单位负责人id */ + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @TableField(value = "responsible_unit_leader") @ApiModelProperty(value="责任单位负责人id") private String responsibleUnitLeader; @@ -94,6 +96,7 @@ public class ProcessProjectStandardTermApproval { /** * 评估结果(1-符合、2-不符合、3-不涉及) */ + @Dict(dicCode = "assess_results") @TableField(value = "assess_results") @ApiModelProperty(value="评估结果(1-符合、2-不符合、3-不涉及)") private String assessResults; @@ -101,6 +104,7 @@ public class ProcessProjectStandardTermApproval { /** * 是否立项 */ + @Dict(dicCode = "yn") @TableField(value = "project_approval_flag") @ApiModelProperty(value="是否立项") private String projectApprovalFlag; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 5fed4339..538763fc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -852,4 +852,10 @@ public class ProcessProjectStandardService extends ServiceImpl getTermApprovalList(String id) { + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(ProcessProjectStandardTermApproval::getTermId,id); + return termApprovalService.list(wrapper1); + } }