瀏覽代碼

fix: 单一任务批量审核sql查询超时问题修复

lixuesong 2 年之前
父節點
當前提交
b35fb16458

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -558,7 +558,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		// 拆分是否通过状态、待审核状态,用于sql优化~
 		if (ArrayUtil.isNotEmpty(entTaskStatus)) {
 			// 通过状态
-			String approvedStatus = "";
+			String approvedStatus = null;
 			// 待审核状态
 			String waitStatus = "";
 			if (ArrayUtil.containsAll(entTaskStatus, "1", "2")) {

+ 4 - 4
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -1349,19 +1349,19 @@ FROM
 			or
 			t.report_drug_id in (select id from wm_report where drug_ent_id=#{query.drugEntId})
 		)
-		<if test="query.approvedStatus != null and query.waitStatus != '0'">
+		<if test="query.approvedStatus != null and query.waitStatus != 0">
 			and (t.report_drug_approval_opinion in ( #{query.approvedStatus})
 				or t.report_one_approval_opinion in ( #{query.approvedStatus}))
 		</if>
-		<if test="query.approvedStatus == null and query.waitStatus == '0'">
+		<if test="query.approvedStatus == null and query.waitStatus == 0">
 			and (t.report_drug_approval_opinion is null
 			or t.report_one_approval_opinion is null)
 		</if>
-		<if test="query.approvedStatus == '1' and query.waitStatus == '0'">
+		<if test="query.approvedStatus == '1' and query.waitStatus == 0">
 			and (t.report_drug_approval_opinion != '2'
 			or t.report_one_approval_opinion != '2')
 		</if>
-		<if test="query.approvedStatus == '2' and query.waitStatus == '0'">
+		<if test="query.approvedStatus == '2' and query.waitStatus == 0">
 			and (t.report_drug_approval_opinion != '1'
 			or t.report_one_approval_opinion != '1')
 		</if>