提交

src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -651,6 +651,8 @@ public class BizProcessInspecionController extends BaseController {
         //根据dayworkId查询外协回收信息是否有该批次
         BizReturnReceiptDetail bizReturnReceiptDetail = new BizReturnReceiptDetail();
         bizReturnReceiptDetail.setDayworkId(dayworkCarrier.getDayworkId());
+        bizReturnReceiptDetail.setStatus(1);
+        bizReturnReceiptDetail.setIsAudit(1);
         List<BizReturnReceiptDetail> detailList = bizReturnReceiptDetailService.getList(bizReturnReceiptDetail);
         System.out.println("查询是否有该批次：detailList" + detailList);
         if (detailList.size() == 0) {

src/main/java/cn/ezhizao/project/business/product/domain/BizReturnReceiptDetail.java

@@ -140,5 +140,9 @@ public class BizReturnReceiptDetail extends BaseEntity
     private String processAlias;
     private String processStepNumber;
     private String processCode;
+    @ApiModelProperty("是否审核")
+    private Integer status;
+    @ApiModelProperty("是否确认")
+    private Integer isAudit;
 
 }

src/main/resources/mybatis/business/product/BizProcessInspecionMapper.xml

@@ -41,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTimeString != null and startTimeString!=''">AND start_time &gt;= #{startTimeString}</if>
             <if test="endTimeString != null and endTimeString!='' ">AND start_time &lt;= #{endTimeString}</if>
             <if test="status != null ">AND status = #{status}</if>
-            <if test="keyword != null  and keyword != '' ">AND (lot_code LIKE CONCAT('%',#{keyword},'%') OR
+            <if test="keyword != null  and keyword != '' ">
+                AND (lot_code LIKE CONCAT('%',#{keyword},'%') OR
                 carrier_code LIKE CONCAT('%',#{keyword},'%') OR
                 product_description LIKE CONCAT('%',#{keyword},'%') or
                 inspection_carrier_code like CONCAT('%',#{keyword},'%')

src/main/resources/mybatis/business/product/BizReturnReceiptDetailMapper.xml

@@ -26,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="newCarrier != null  and newCarrier != ''"> AND new_carrier = #{newCarrier}</if>
             <if test="newCarrierCount != null "> AND new_carrier_count = #{newCarrierCount}</if>
             <if test="dayworkId != null "> AND daywork_id = #{dayworkId}</if>
+            <if test="status != null "> AND status = #{status}</if>
+            <if test="isAudit != null "> AND is_audit = #{isAudit}</if>
         </trim>
     </select>
     <select id="getFinishedReturnList" parameterType="BizReturnReceiptDetail" resultMap="BizReturnReceiptDetailResult">