Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -254,7 +254,7 @@ public class BizReturnReceiptController extends BaseController
                     if (item.getDayworkId().equals(info.getDayworkId())&&item.getProcessStepNumber().equals(info.getProcessStepNumber())&& item.getLotId().equals(bizReturnReceiptDetail.getLotId())) {
                         item.setStatus("3");
                         item.setEndTime(date);
-                        item.setNickName("外协");
+                        item.setNickName(bizReturnReceiptDetail.getSupplierName());
                         item.setQualifiedNum(bizReturnReceiptDetail.getAuditNum());
                         long timeDifference = date.getTime() - item.getStartTime().getTime();
                         item.setWorkingHours(timeDifference);
@@ -298,7 +298,7 @@ public class BizReturnReceiptController extends BaseController
                     if (item.getDayworkId().equals(bizReturnReceiptDetail.getDayworkId())&&item.getProcessStepNumber().equals(bizReturnReceiptDetail.getProcessStepNumber()) && item.getLotId().equals(bizReturnReceiptDetail.getLotId())) {
                         item.setStatus("3");
                         item.setEndTime(date);
-                        item.setNickName("外协");
+                        item.setNickName(bizReturnReceiptDetail.getSupplierName());
                         item.setQualifiedNum(bizReturnReceiptDetail.getAuditNum());
                         long timeDifference = date.getTime() - item.getStartTime().getTime();
                         item.setWorkingHours(timeDifference);

src/main/resources/mybatis/business/BizDayworkMapper.xml

@@ -364,7 +364,7 @@
             <if test="endTime != null ">AND t1.end_time &lt;= #{endTime}</if>
             <if test="productDescription != null and productDescription != ''">AND t1.production_plan_detail_id in (select id from biz_production_plan_detail where deleted = 0 and product_description  LIKE CONCAT('%', #{productDescription}, '%'))</if>
             <if test="lotCode != null and lotCode != ''">AND t1.lot_id in (select id from biz_lot where deleted = 0 and lot_code  LIKE CONCAT('%', #{lotCode}, '%'))</if>
-            <if test="nickName != null and nickName != ''">AND t2.nick_name  LIKE CONCAT('%', #{nickName}, '%')</if>
+            <if test="nickName != null and nickName != ''">AND t1.nick_name  LIKE CONCAT('%', #{nickName}, '%')</if>
             <if test="originalCarrier != null and originalCarrier != ''">AND t1.daywork_id in (select daywork_id from biz_daywork_carrier where deleted = 0 AND  is_changed=0 and carrier_code LIKE CONCAT('%', #{originalCarrier}, '%'))  </if>
             <if test="processId != null  and processId != 0">AND t1.process_id = #{processId}</if>
             ORDER BY t1.lot_id, t1.end_time DESC