特殊报工

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

@@ -94,10 +94,6 @@ public class BizSpecialDayworkController extends BaseController {
     private IBizProductionPlanDetailService bizProductionPlanDetailService;
     @Resource
     private IBizFurnaceNoInfoService bizFurnaceNoInfoService;
-
-    @Resource
-    private ISysDeptUserService deptUserService;
-
     @Resource
     private IBizLotService bizLotService;
 

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

@@ -71,9 +71,6 @@
             <if test="specialStartTime != null "> AND
                 dw.start_time
                 >= #{specialStartTime}</if>
-<!--            <if test="deptId != null "> AND-->
-<!--                dw.dept_id-->
-<!--                = #{deptId}</if>-->
             <if test="specialEndTime != null "> AND
                 dw.start_time &lt;= #{specialEndTime}</if>
             <if test="lotCode != null and  lotCode != ''">AND   dw.lot_code LIKE CONCAT('%', #{lotCode}, '%') </if>

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

@@ -255,7 +255,7 @@
     <select id="selectScreenDaywork" resultMap="BizDayworkResult" parameterType="list">
         SELECT
         d.*,
-        (SELECT status FROM biz_daywork_item WHERE daywork_id=d.id AND deleted=0 ORDER BY id DESC LIMIT 1)AS item_status,
+        (SELECT status FROM biz_daywork_item WHERE daywork_id=d.id AND deleted=0 ORDER BY create_time DESC LIMIT 1)AS item_status,
         (SELECT technological_process_detail_id FROM biz_daywork_item WHERE daywork_id=d.id AND deleted=0 ORDER BY create_time DESC LIMIT 1)AS special_process_id,
         (SELECT special_is_first FROM biz_daywork_item WHERE daywork_id=d.id AND deleted=0 ORDER BY id DESC LIMIT 1)AS special_is_first
         FROM