0205

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

@@ -207,7 +207,7 @@ public class BizDayworkItemController extends BaseController {
     @Log(title = "查询报工记录", businessType = BusinessType.SELECT)
     public TableDataInfo assistList(BizDayworkItem bizDayworkItem) {
         //0420
-        List<BizDayworkItem> list = bizDayworkItemService.getList(bizDayworkItem);
+        List<BizDayworkItem> list = bizDayworkItemService.getAssistList(bizDayworkItem);
         //如果是废品回用，ProcessSequence从新表拿
         if(bizDayworkItem.getIsAmend() ==1  ||bizDayworkItem.getIsWasteRecycling() ==1 ) {
             BizLot bizLot = bizLotService.query().eq("id",bizDayworkItem.getLotId()).list().get(0);

src/main/java/cn/ezhizao/project/business/product/mapper/BizDayworkItemMapper.java

@@ -22,6 +22,7 @@ public interface BizDayworkItemMapper extends BaseMapper<BizDayworkItem>
      * @return 报工记录集合
      */
     public List<BizDayworkItem> getList(BizDayworkItem bizDayworkItem);
+    public List<BizDayworkItem> getAssistList(BizDayworkItem bizDayworkItem);
     public List<BizDaywork> getInnerListByDeptId(BizDayworkItem bizDayworkItem);
     public List<BizDaywork> getOutListByDeptId(BizDayworkItem bizDayworkItem);
 

src/main/java/cn/ezhizao/project/business/product/service/IBizDayworkItemService.java

@@ -21,6 +21,7 @@ public interface IBizDayworkItemService extends IService<BizDayworkItem>
      * @return 报工记录集合
      */
     public List<BizDayworkItem> getList(BizDayworkItem bizDayworkItem);
+    public List<BizDayworkItem> getAssistList(BizDayworkItem bizDayworkItem);
     public List<BizDaywork> getInnerListByDeptId(BizDayworkItem bizDayworkItem);
     public List<BizDaywork> getOutListByDeptId(BizDayworkItem bizDayworkItem);
 

src/main/java/cn/ezhizao/project/business/product/service/impl/BizDayworkItemServiceImpl.java

@@ -47,6 +47,11 @@ public class BizDayworkItemServiceImpl  extends ServiceImpl<BizDayworkItemMapper
         return bizDayworkItemMapper.getList(bizDayworkItem);
     }
 
+    @Override
+    public List<BizDayworkItem> getAssistList(BizDayworkItem bizDayworkItem) {
+        return bizDayworkItemMapper.getAssistList(bizDayworkItem);
+    }
+
     @Override
     public List<BizDaywork> getInnerListByDeptId(BizDayworkItem bizDayworkItem) {
         return bizDayworkItemMapper.getInnerListByDeptId(bizDayworkItem);

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

@@ -383,6 +383,36 @@
         </trim>
         ORDER BY  create_time DESC
     </select>
+    <select id="getAssistList" parameterType="BizDayworkItem" resultMap="BizDayworkItemResult">
+        SELECT * FROM biz_daywork_item
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="type != null">AND status &lt; 4</if>
+            <if test="dayworkId != null and dayworkId != ''">AND daywork_id = #{dayworkId}</if>
+            <if test="processId != null and processId != ''">AND process_id = #{processId}</if>
+            <if test="technologicalProcessDetailId != null and technologicalProcessDetailId != ''">AND
+                technological_process_detail_id = #{technologicalProcessDetailId}
+            </if>
+            <if test="status != null and status != ''">AND status = #{status}</if>
+            <if test="turnoverType != null">AND turnover_type != #{turnoverType}</if>
+            <if test="userStatus != null and userStatus != ''">AND `status` &lt; 5</if>
+            <if test="tenantId != null  and tenantId != 0">AND tenant_id = #{tenantId}</if>
+            <if test="updaterId != null  and updaterId != 0">AND updater_id = #{updaterId}</if>
+            <if test="turnoverId != null and turnoverId != ''">AND turnover_id = #{turnoverId}</if>
+            <if test="workshopId != null">AND exists (select 1 from biz_workshop_turnover where biz_workshop_turnover.id
+                = biz_daywork_item.turnover_id and biz_workshop_turnover.deleted = 0 and
+                biz_workshop_turnover.workshop_id = #{workshopId})
+            </if>
+            <if test="id != null">AND id = #{id}</if>
+            <if test="ids != null and ids.size > 0">
+                AND id in
+                <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
+                    #{item,jdbcType=BIGINT}
+                </foreach>
+            </if>
+        </trim>
+        ORDER BY  create_time DESC
+    </select>
     <select id="getOutListByDeptId" resultType="cn.ezhizao.project.business.product.domain.BizDaywork">
         SELECT distinct
         t1.id,t2.dept_name,t3.product_description,t4.lot_code,t1.is_amend,t1.is_waste_recycling,t1.technological_process_id

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

@@ -117,13 +117,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.status = 1 AND t1.deleted = 0 AND (
             t1.dept_id = #{deptId}
-            OR t1.dept_id = (
+            OR (t1.dept_id = (
             SELECT t.dept_id
             FROM biz_daywork_item t
-            WHERE t.daywork_id = 1886976660903870466
+            WHERE t.daywork_id = t1.id
             AND t.deleted = 0
             ORDER BY t.create_time DESC
             LIMIT 1
+            ) and ( SELECT t2.status
+            FROM biz_daywork_item t2
+            WHERE t2.daywork_id = t1.id AND t2.deleted = 0
+            ORDER BY t2.create_time DESC
+            LIMIT 1) = 4
             )
             )
             AND (