Merge remote-tracking branch 'origin/master'

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

@@ -1153,6 +1153,8 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setUserId(user.getUserId());
                 bizItem.setUserName(user.getUserName());
                 bizItem.setNickName(user.getNickName());
+                bizItem.setIsSpecial(lastItem.getIsSpecial());
+                bizItem.setSpecialIsFirst(lastItem.getSpecialIsFirst());
                 bizItem.setWorkingHours(0L);
                 bizItem.setTenantId(lastItem.getTenantId());
                 bizItem.setProductionPlanDetailId(lastItem.getProductionPlanDetailId());
@@ -1280,6 +1282,8 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setUserId(user.getUserId());
                 bizItem.setUserName(user.getUserName());
                 bizItem.setNickName(user.getNickName());
+                bizItem.setIsSpecial(lastItem.getIsSpecial());
+                bizItem.setSpecialIsFirst(lastItem.getSpecialIsFirst());
                 bizItem.setWorkingHours(0L);
                 bizItem.setDeptId(lastItem.getDeptId());
                 bizItem.setTenantId(lastItem.getTenantId());

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

@@ -91,6 +91,15 @@ public class BizDayworkItem extends BaseEntity
     @ApiModelProperty(value = "生产状态 0:未开始, 1: 生产中, 2: 报工结束 ,3: 工序已完成, 4: 待周转，5: 周转中，6: 已送达，7：已接收")
     private String status;
 
+    /** 是否有特殊报工 */
+    @Excel(name = "是否特殊报工")
+    @ApiModelProperty(value = "是否特殊报工")
+    private Integer isSpecial;
+
+    @Excel(name = "特殊报工是否首序")
+    @ApiModelProperty(value = "特殊报工是否首序")
+    private Integer  specialIsFirst;
+
     /** 用户id */
     private Long userId;
     /** 接收人id */