异常项目对比，清除重新填写原始记录消除异常的对比项；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IItemComparisonService.java

@@ -40,7 +40,7 @@ public interface IItemComparisonService extends IBaseService<ItemComparison> {
      * @param queryDTO the query dto
      * @return the list
      */
-    List<ItemComparison> listCompareItems(SlotQueryDTO queryDTO);
+    List<List<ItemComparison>> listCompareItems(SlotQueryDTO queryDTO);
 
     /**
      * Save data batch boolean.
@@ -63,8 +63,8 @@ public interface IItemComparisonService extends IBaseService<ItemComparison> {
     /**
      * 是否存在对比数据
      *
-     * @param sampleCodeList
-     * @return
+     * @param sampleCodeList the sample code list
+     * @return boolean boolean
      */
     boolean isExistCompareData(List<String> sampleCodeList);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java

@@ -344,7 +344,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Transactional(rollbackFor = Exception.class)
-    protected void generateCompareItems(Long[] ids, Account account) {
+    public void generateCompareItems(Long[] ids, Account account) {
         if (ArrayUtils.isEmpty(ids)) {
             logger.error("==== EntrustReportServiceImpl ==== generateCompareItems ====> 报告IDS数据为空！");
             return;
@@ -631,7 +631,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Transactional(rollbackFor = Exception.class)
-    protected boolean doExecuteSubmit(Long[] ids, EntrustFlowEnum fromFlowStatus, EntrustFlowEnum toFlowStatus, Account account) {
+    public boolean doExecuteSubmit(Long[] ids, EntrustFlowEnum fromFlowStatus, EntrustFlowEnum toFlowStatus, Account account) {
         Entrust entrust = handleConditionGetEntrust(ids);
         String statusPath = entrust.getStatusPath(), flowStatus = entrust.getFlowStatus();
 

src/main/resources/mapper/hmhj/ItemComparisonMapper.xml

@@ -29,6 +29,21 @@
             <if test="null != vo.queryDate">
                 and ic.compare_date = to_char(#{vo.queryDate}::timestamp,'yyyy-MM-dd')
             </if>
+            <if test="null != vo.sampleCodes">
+                and ic.sample_code in
+                <foreach collection="vo.sampleCodes" item="sc" open="(" separator="," close=")">
+                    #{sc}
+                </foreach>
+            </if>
+            <if test="null != vo.itemNames">
+                and ic.name in
+                <foreach collection="vo.itemNames" item="itn" open="(" separator="," close=")">
+                    #{itn}
+                </foreach>
+            </if>
+            <if test="null != vo.queryDate">
+                and ic.compare_date = to_char(#{vo.queryDate}::timestamp,'yyyy-MM-dd')
+            </if>
         </where>
         order by ic.sample_code desc,ic.name
     </select>