Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -203,6 +203,8 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
     public AjaxResult finished (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
         // 添加报工废品
         bizDayworkAuxiliaryItem.setStatus("3");
+        bizDayworkAuxiliaryItem.setEndTime(new Date());
+        bizDayworkAuxiliaryItem.setWorkingHours(bizDayworkAuxiliaryItem.getEndTime().getTime() - bizDayworkAuxiliaryItem.getStartTime().getTime());
         List<BizDayworkItemReject> rejects = new ArrayList<>();
         bizDayworkAuxiliaryItem.getRejectList().forEach(l -> {
             BizDayworkItemReject reject = new BizDayworkItemReject(l);

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/domain/BizDayworkAuxiliaryItem.java

@@ -164,4 +164,7 @@ public class BizDayworkAuxiliaryItem extends BaseEntity
     private List<BizDayworkAuxiliaryItemReject> rejectList;
     @TableField(exist = false)
     private BizProduct product;
+
+    private Long workingHours;
+
 }

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/domain/BizDayworkAuxiliaryItemReject.java

@@ -69,6 +69,11 @@ public class BizDayworkAuxiliaryItemReject extends BaseEntity
         super();
         this.dayworkItemId = l.getId();
         this.dayworkId = l.getDayworkId();
-        this.prodNum = l.getQualifiedNum();
+        // 判断是否完成假设已完成 合格数为投产量 假设未完成 投产量为投产量
+        if (l.getStatus().equals("2") || l.getStatus().equals("3")) {
+            this.prodNum = l.getQualifiedNum();
+        } else {
+            this.prodNum = l.getProdNum();
+        }
     }
 }

src/main/resources/mybatis/business/auxiliaryDaywork/BizDayworkAuxiliaryItemMapper.xml

@@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getList" parameterType="BizDayworkAuxiliaryItem" resultMap="BizDayworkAuxiliaryItemResult">
-        SELECT t1.* FROM biz_daywork_auxiliary_item t1
+        SELECT t1.* FROM biz_daywork_auxiliary_item t1 left join biz_product t3 on t3.id = t1.product_id left join biz_lot t4 on t4.id = t1.lot_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="deptName != null  and deptName != ''"> AND t1.dept_name like concat('%', #{deptName}, '%')</if>
@@ -161,6 +161,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nickName != null  and nickName != ''"> AND t1.nick_name like concat('%', #{nickName}, '%')</if>
             <if test="startTimeString != null and startTimeString!=''">AND t1.start_time &gt;= #{startTimeString}</if>
             <if test="endTimeString != null and endTimeString!='' ">AND t1.start_time &lt;= #{endTimeString}</if>
+            <if test="keyword != null">AND ( t3.description like concat('%',#{keyword},'%') or t4.lot_code like concat('%',#{keyword},'%') or exists (select 1
+                FROM
+                biz_daywork_carrier
+                WHERE
+                biz_daywork_carrier.daywork_id = t1.daywork_id
+                AND biz_daywork_carrier.is_changed = 0
+                AND biz_daywork_carrier.deleted = 0
+                and biz_daywork_carrier.carrier_code like concat('%',#{keyword},'%')
+                ) )</if>
         </trim>
     </select>
 

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

@@ -58,7 +58,6 @@
     <resultMap id="BizDayworkItemAndRejectList" type="cn.ezhizao.project.business.product.domain.BizDayworkItem">
         <id column="id" property="id"/>
         <collection property="rejectList" ofType="cn.ezhizao.project.business.product.domain.BizDayworkItemReject" column="id" select="getRejectList"/>
-
     </resultMap>
     <resultMap id="BizSortListResult" type="cn.ezhizao.project.business.product.domain.BizDayworkItem">
         <id column="id" property="id"/>