yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java

@@ -160,9 +160,6 @@ public class LabourApiController extends BaseController {
             surProjectAttendanceGroup.setName(req.getName());
             surProjectAttendanceGroup.setLeaderName(req.getLeaderName());
             surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone());
-            surProjectAttendanceGroup.setType(req.getType());
-            surProjectAttendanceGroup.setEnterDate(req.getEnterDate());
-            surProjectAttendanceGroup.setExitDate(req.getExitDate());
             surProjectAttendanceGroup.setIsDel(req.getIsDel());
             surProjectAttendanceGroup.setUpdateBy(VendorsCodeEnum.YANZHU.getCode());
             surProjectAttendanceGroup.setUpdateTime(new Date());
@@ -179,9 +176,6 @@ public class LabourApiController extends BaseController {
             surProjectAttendanceGroup.setName(req.getName());
             surProjectAttendanceGroup.setLeaderName(req.getLeaderName());
             surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone());
-            surProjectAttendanceGroup.setType(req.getType());
-            surProjectAttendanceGroup.setEnterDate(req.getEnterDate());
-            surProjectAttendanceGroup.setExitDate(req.getExitDate());
             surProjectAttendanceGroup.setIsDel(req.getIsDel());
             surProjectAttendanceGroup.setCreateBy(sysApplyConfig.getAppId());
             surProjectAttendanceGroup.setCreateTime(new Date());
@@ -230,11 +224,9 @@ public class LabourApiController extends BaseController {
             surProjectAttendanceUser.setGroupId(req.getGroupId());
             surProjectAttendanceUser.setGroupName(req.getGroupName());
             surProjectAttendanceUser.setWorkTypeName(req.getWorkTypeName());
-            surProjectAttendanceUser.setWorkerCategory(req.getWorkerCategory());
             surProjectAttendanceUser.setSpecWorkType(req.getSpecWorkType());
             surProjectAttendanceUser.setState(req.getState());
             surProjectAttendanceUser.setEnterDate(req.getEnterDate());
-            surProjectAttendanceUser.setExitDate(req.getExitDate());
             surProjectAttendanceUser.setCompanyId(req.getCompanyId());
             surProjectAttendanceUser.setCompanyName(req.getCompanyName());
             surProjectAttendanceUser.setLeader(req.getGroupLeader());
@@ -256,11 +248,9 @@ public class LabourApiController extends BaseController {
             surProjectAttendanceUser.setGroupId(req.getGroupId());
             surProjectAttendanceUser.setGroupName(req.getGroupName());
             surProjectAttendanceUser.setWorkTypeName(req.getWorkTypeName());
-            surProjectAttendanceUser.setWorkerCategory(req.getWorkerCategory());
             surProjectAttendanceUser.setSpecWorkType(req.getSpecWorkType());
             surProjectAttendanceUser.setState(req.getState());
             surProjectAttendanceUser.setEnterDate(req.getEnterDate());
-            surProjectAttendanceUser.setExitDate(req.getExitDate());
             surProjectAttendanceUser.setCompanyId(req.getCompanyId());
             surProjectAttendanceUser.setCompanyName(req.getCompanyName());
             surProjectAttendanceUser.setLeader(req.getGroupLeader());

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java

@@ -39,17 +39,9 @@ public class LabourGroupReqVo {
     private String leaderPhone;
 
     /** 进场日期 */
-    @NotNull(message = "进场日期不能为空")
+    @NotBlank(message = "进场日期不能为空")
-    private Long enterDate;
+    @Size(max = 32, message = "进场日期格式异常")
-
+    private String enterDate;
-    /** 退场日期 */
-    private Long exitDate;
-
-    /**
-     * 班组类型1:建筑工人班组;2:管理人员班组
-     */
-    @NotNull(message = "进场日期不能为空")
-    private Long type;
 
     /** 数据是否有效 */
     @NotNull(message = "数据是否有效不能为空")
@@ -136,27 +128,11 @@ public class LabourGroupReqVo {
         this.leaderPhone = leaderPhone;
     }
 
-    public Long getEnterDate() {
+    public String getEnterDate() {
         return enterDate;
     }
 
-    public void setEnterDate(Long enterDate) {
+    public void setEnterDate(String enterDate) {
         this.enterDate = enterDate;
     }
-
-    public Long getExitDate() {
-        return exitDate;
-    }
-
-    public void setExitDate(Long exitDate) {
-        this.exitDate = exitDate;
-    }
-
-    public Long getType() {
-        return type;
-    }
-
-    public void setType(Long type) {
-        this.type = type;
-    }
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java

@@ -1,5 +1,7 @@
 package com.yanzhu.manage.api.vo;
 
+import com.yanzhu.common.core.annotation.Excel;
+
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -68,13 +70,10 @@ public class LabourUserReqVo {
     private Long state;
 
     /** 进场日期 */
-    @NotNull(message = "进场日期不能为空")
+    @NotBlank(message = "进场日期不能为空")
+    @Size(max = 32, message = "进场日期格式异常")
     private String enterDate;
 
-    /** 进场日期 */
-    @NotNull(message = "进场日期不能为空")
-    private String exitDate;
-
     /** 分包商id */
     @NotBlank(message = "分包商ID不能为空")
     private String companyId;
@@ -84,13 +83,9 @@ public class LabourUserReqVo {
     private String companyName;
 
     /** 是否班组长 */
-    @NotNull(message = "是否班组长不能为空")
+    @NotNull(message = "是否班组长")
     private Integer groupLeader;
 
-    /** 人员类别0：工人，1：管理人员 */
-    @NotNull(message = "人员类别不能为空")
-    private Long workerCategory;
-
     /** 数据是否有效 */
     @NotNull(message = "数据是否有效不能为空")
     @Max(value = 1, message = "数据是否有效格式异常，0有效|1无效")
@@ -200,14 +195,6 @@ public class LabourUserReqVo {
         this.enterDate = enterDate;
     }
 
-    public String getExitDate() {
-        return exitDate;
-    }
-
-    public void setExitDate(String exitDate) {
-        this.exitDate = exitDate;
-    }
-
     public String getCompanyId() {
         return companyId;
     }
@@ -240,11 +227,4 @@ public class LabourUserReqVo {
         this.isDel = isDel;
     }
 
-    public Long getWorkerCategory() {
-        return workerCategory;
-    }
-
-    public void setWorkerCategory(Long workerCategory) {
-        this.workerCategory = workerCategory;
-    }
 }