修改:参数修改问题修改

src/main/java/com/xdap/self_development/pojo/Template.java

@@ -11,7 +11,7 @@ import java.sql.Timestamp;
 
 @SQLQuery(value = {
         @SQL(view = "getLatestTemplateOrder",
-                sql = "SELECT ranked.order_num, ranked.id, ranked.template_name, ranked.version, ranked.status, ranked.created_time , ranked.published_time, xu.username AS 'createBy' FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM yfsjglpt_model_template t WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) ranked LEFT JOIN xdap_users xu ON xu.id = ranked.create_by WHERE rn = 1 ORDER BY CASE status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC, ranked.order_num desc"),
+                sql = "SELECT ranked.order_num, ranked.id, ranked.template_name, ranked.version, ranked.status , ranked.created_time, ranked.published_time, xu.username AS \"createBy\" FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM ( SELECT DISTINCT id, template_name, version, status, created_time , published_time, order_num, create_by FROM yfsjglpt_model_template WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) t ) ranked LEFT JOIN xdap_users xu ON xu.id = ranked.create_by WHERE rn = 1 ORDER BY CASE status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC, ranked.order_num DESC"),
         // 查找每个模板的最新版本并且优先级按照已发布、审核中、草稿状态转变（只有这三种状态）
         @SQL(view = "getLatestTemplate",
                 sql = "SELECT ROW_NUMBER() OVER (ORDER BY CASE ranked.status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC, ranked.order_num DESC) AS order_num, ranked.id, ranked.template_name, ranked.version , ranked.status, ranked.created_time, ranked.published_time, xu.username AS \"createBy\" FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM yfsjglpt_model_template t WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) ranked LEFT JOIN xdap_users xu ON xu.id = ranked.create_by WHERE rn = 1 ORDER BY CASE ranked.status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC, ranked.order_num DESC"

src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java

@@ -291,7 +291,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .eq("flow_type", 1)
                 .doQueryFirst(ApprovalFlow.class);
 
-        if (flow == null) {
+        if (flowId == null || flowId.isEmpty() || flow == null) {
             return approvalFlowView;
         }
         approvalFlowView.setExplanation(flow.getExplanation());

src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java

@@ -127,6 +127,16 @@ public class ParameterServiceImpl implements ParameterService {
 		if (!"DRAFT".equals(status) && !"COMPLETE".equals(status)) {
 			throw new CommonException("该状态的模板不可修改，仅支持草稿/已发布状态");
 		}
+
+		// 同名模板审核中不可修改
+		List<Template> templates = bd.getBusinessDatabase()
+				.eq("template_name", benchmark.getBaseTemplate().getTemplateName())
+				.orderBy("version", "asc").doQuery(Template.class);
+		boolean approving = templates.stream().map(Template::getStatus)
+				.collect(Collectors.toList()).contains("APPROVING");
+		if (approving) {
+			throw new CommonException("同名模板已在审核中,暂时不能修改参数");
+		}
 	}
 
 	/**