产前准备增加筛选条件

common/src/main/java/com/foreverwin/mesnac/common/service/ProdReadyTaskService.java

@@ -34,7 +34,7 @@ public interface ProdReadyTaskService extends IService<ProdReadyTask> {
 
     ProdReadyTask loadProExecute(String taskBo);
 
-    List<Map<String, Object>> getInspectionDetailList(Map<String, String> param);
+    List<Map<String, Object>>    getInspectionDetailList(Map<String, String> param);
 
     boolean saveResult(ProdReadyTask prodReadyTask);
 }

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -269,7 +269,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         if (byId.getStatus().equals(STATUS_CANCEL)) {
             throw new BaseException("产前准备任务任务已取消");
         }
-        if (byId.getStatus().equals(STATUS_FINISH)) {
+        if (byId.getStatus().equals(STATUS_FINISH)&&byId.getResult().equals(Constants.RSESULT_OK)) {
             throw new BaseException("产前准备任务任务已完成");
         }
         List<ProdReadyTaskDetail> prodReadyTaskDetailList = prodReadyTask.getProdReadyTaskDetailList();

common/src/main/resources/mapper/ProdReadyTaskMapper.xml

@@ -640,6 +640,7 @@
         <if test="entity.resrce!=null and entity.resrce!='' "> AND ZPRT.RESRCE=#{entity.resrce}</if>
         <if test="entity.dispatchNo!=null and entity.dispatchNo!='' "> AND ZSD.DISPATCH_NO=#{entity.dispatchNo}</if>
         <if test="entity.status!=null and entity.status!='' "> AND ZPRT.STATUS=#{entity.status}</if>
+        <if test="entity.result!=null and entity.result!='' "> AND ZPRT.RESULT=#{entity.result}</if>
         <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus=='COMPLETE' "> AND ZSD.DISPATCH_STATUS=#{entity.sfcStepStatus}</if>
         <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus!='COMPLETE' "> AND ZSD.DISPATCH_STATUS!='COMPLETE'</if>
         <if test="entity.sfc!=null and entity.sfc!='' "> AND ZPRT.SFC=#{entity.sfc}</if>