From 0edc3baadb011bb75cdac3d5138047c90347a322 Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Fri, 5 Dec 2025 10:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BFbug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/form/ApprovalListForm.java | 2 ++ .../xdap/self_development/pojo/Parameter.java | 2 ++ .../self_development/pojo/RevisionRecord.java | 6 ++-- .../pojo/view/TemplateChangeView.java | 2 +- .../pojo/view/TodoAndTemplateView.java | 2 +- .../impl/ResponsiblePersonServiceImpl.java | 10 ++++--- .../impl/TemplateApprovalServiceImpl.java | 29 ++++++------------- .../service/impl/TemplateServiceImpl.java | 12 +------- 8 files changed, 25 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/xdap/self_development/controller/form/ApprovalListForm.java b/src/main/java/com/xdap/self_development/controller/form/ApprovalListForm.java index 66ff1ad..23b7ba8 100644 --- a/src/main/java/com/xdap/self_development/controller/form/ApprovalListForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/ApprovalListForm.java @@ -10,5 +10,7 @@ public class ApprovalListForm { private String userId; private String templateName; + private String username; + private String createDate; private String status; } diff --git a/src/main/java/com/xdap/self_development/pojo/Parameter.java b/src/main/java/com/xdap/self_development/pojo/Parameter.java index b419c7e..e2a03ab 100644 --- a/src/main/java/com/xdap/self_development/pojo/Parameter.java +++ b/src/main/java/com/xdap/self_development/pojo/Parameter.java @@ -9,6 +9,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @SQLQuery(value = { + @SQL(view = "getAllSubsystem", + sql = "SELECT DISTINCT mp.subsystem_name FROM yfsjglpt_model_parameter mp INNER JOIN yfsjglpt_model_parameter_and_template mpat ON mp.id = mpat.parameter_id INNER JOIN yfsjglpt_model_template mt ON mpat.template_id = mt.id INNER JOIN ( SELECT template_name, MAX(version) AS max_version FROM yfsjglpt_model_template WHERE status = 'COMPLETE' GROUP BY template_name ) latest ON mt.template_name = latest.template_name AND mt.version = latest.max_version WHERE mt.status = 'COMPLETE' ORDER BY mt.template_name, mp.subsystem_name, mp.parameter_name"), @SQL(view = "selectParametersByTemplateId", sql = "select p.* from yfsjglpt_model_parameter p left join yfsjglpt_model_parameter_and_template tap on p.id = tap.parameter_id where tap.template_id = #templateId"), @SQL(view = "selectMaxNumber", sql = diff --git a/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java b/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java index 64291a4..1e00df2 100644 --- a/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java +++ b/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java @@ -25,20 +25,20 @@ public class RevisionRecord extends MpaasBasePojo { private String templateId; private String preTemplateId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp createdTime; + private Timestamp createTime; private String parameterId; public RevisionRecord(String templateName, Integer version, Integer parameterNumber, String modifyDetails, String templateId, String preTemplateId, - Timestamp createdTime, String parameterId) { + Timestamp createTime, String parameterId) { this.templateName = templateName; this.version = version; this.parameterNumber = parameterNumber; this.modifyDetails = modifyDetails; this.templateId = templateId; this.preTemplateId = preTemplateId; - this.createdTime = createdTime; + this.createTime = createTime; this.parameterId = parameterId; } } diff --git a/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java b/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java index c1b4bb1..4c1d545 100644 --- a/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java +++ b/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java @@ -6,7 +6,7 @@ import lombok.Data; @SQLQuery(value = { @SQL(view = "getParameterAndChange", - sql = "SELECT p.*, r.modify_details FROM ( SELECT *, ROW_NUMBER() OVER (PARTITION BY parameter_id ORDER BY created_time DESC) AS rn FROM yfsjglpt_model_revision_record ) r LEFT JOIN yfsjglpt_model_parameter p ON r.parameter_id = p.id WHERE r.rn = 1 and r.template_id = #templateId") + sql = "SELECT p.*, r.modify_details FROM ( SELECT *, ROW_NUMBER() OVER (PARTITION BY parameter_id ORDER BY create_time DESC) AS rn FROM yfsjglpt_model_revision_record ) r LEFT JOIN yfsjglpt_model_parameter p ON r.parameter_id = p.id WHERE r.rn = 1 and r.template_id = #templateId") }) @Data public class TemplateChangeView { diff --git a/src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java b/src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java index f6ccb2d..0e5bed8 100644 --- a/src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java +++ b/src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java @@ -13,7 +13,7 @@ import java.util.List; @SQL(view = "getApprovalByUserIdAndIds", sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id WHERE t.template_name like CONCAT('%',#templateName, '%') and t.status like CONCAT('%',#status, '%') and af.flow_type = 1 and af.id NOT IN (#ids) AND af.create_by = #createBy"), @SQL(view = "getTodoAndTemplate", - sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id WHERE t.template_name like CONCAT('%',#templateName, '%') and t.status like CONCAT('%',#status, '%') and af.flow_type = 1 and af.id IN (#ids)") + sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id LEFT JOIN xdap_users xu ON xu.id = create_by WHERE t.template_name LIKE CONCAT('%', #templateName, '%') AND t.status LIKE CONCAT('%', #status, '%') AND t.created_time LIKE CONCAT('%', #createdTime, '%') AND xu.username LIKE CONCAT('%', #username, '%') AND af.flow_type = 1 AND af.id IN (#ids)") }) @Data public class TodoAndTemplateView { diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java index 10b0d05..94e5257 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java @@ -7,6 +7,7 @@ import com.xdap.self_development.controller.form.DeptResponsiblePageForm; import com.xdap.self_development.controller.form.ResponsiblePersonForm; import com.xdap.self_development.controller.form.UpdateResponsiblePersonForm; import com.xdap.self_development.exception.CommonException; +import com.xdap.self_development.pojo.Parameter; import com.xdap.self_development.pojo.ResponsiblePerson; import com.xdap.self_development.pojo.Template; import com.xdap.self_development.service.ResponsiblePersonService; @@ -109,10 +110,11 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { @Override public Set getAllSubsystem() { - List