feat:报告流程回调、手写签名

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml

@@ -35,6 +35,13 @@
         FROM T_BSN_ASY_RPT_DAT d
         inner join T_BSN_BSE_SMP s on d.BSN_BSE_SMP_ID = s.id
         <where>
+            <if test="param.idList != null and param.idList.size > 0">
+                and d.id in (
+                    <foreach item="item" collection="param.idList" separator=",">
+                        #{item}
+                    </foreach>
+                )
+            </if>
             <if test="param.configReportTypeId != null and param.configReportTypeId != ''">
                 and d.CFG_RPT_TP_ID = #{param.configReportTypeId}
                 and NOT EXISTS (
@@ -43,6 +50,7 @@
                     LEFT JOIN T_RPT_DOC_MAIN m on rd.MAIN_ID = m.ID
                     WHERE rd.SRC_ID = d.id
                     and m.RPT_DOC_TP = #{param.configReportTypeId}
+                    and m.FLW_STS in ('not_start','in_progress','completed','rejected')
                 );
             </if>
             <if test="param.businessSampleEntrustRegistrationIdList != null and param.businessSampleEntrustRegistrationIdList.size > 0">

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustRegistrationMapper.xml

@@ -63,7 +63,7 @@
         <where>
             and NOT EXISTS (
             select 1 from T_RPT_DOC_MAIN dm left join T_RPT_DOC_MAIN_CORR dc on dm.id = dc.MAIN_ID
-            where dc.CORR_ID = m.id and dm.deleted = 0
+            where dc.CORR_ID = m.id and dm.FLW_STS in ('not_start','in_progress','completed','rejected') and dm.deleted = 0
             )
             <if test="param.entrustType != null and param.entrustType != ''">
                 and m.ENTT_TP = #{param.entrustType}

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigUserSignatureMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zt.plat.module.qms.business.config.dal.mapper.ConfigUserSignatureMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>