人员管理修改2

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/controller/PeopleListController.java

@@ -89,12 +89,10 @@ public class PeopleListController {
                                     @RequestParam @ApiParam(value = "工作岗位") String job,
                                     @RequestParam @ApiParam(value = "部门") String department,
                                     @RequestParam @ApiParam(value = "工作地点") String workLocation,
-                                    @RequestParam @ApiParam(value = "工作时间段") String workTime,
-                                    @RequestParam @ApiParam(value = "工作日") String workDay,
                                     @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl,
                                     @RequestParam @ApiParam(value = "组织id") String orgId) {
         peopleListService.add(userName, nickName, sex, idCard, phone, publicPhone, province, address, entryDate,
-                workStatus, job, department, workLocation, workTime, workDay, imgUrl,orgId);
+                workStatus, job, department, workLocation, imgUrl,orgId);
         return CommonResult.ok();
     }
 
@@ -122,11 +120,9 @@ public class PeopleListController {
                                      @RequestParam @ApiParam(value = "工作岗位") String job,
                                      @RequestParam @ApiParam(value = "部门") String department,
                                      @RequestParam @ApiParam(value = "工作地点") String workLocation,
-                                     @RequestParam @ApiParam(value = "工作时间段") String workTime,
-                                     @RequestParam @ApiParam(value = "工作日") String workDay,
                                      @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl) {
         peopleListService.edit(id,userName, nickName, sex, idCard, phone, publicPhone, province, address, entryDate,
-                workStatus, job, department, workLocation, workTime, workDay, imgUrl);
+                workStatus, job, department, workLocation,  imgUrl);
         return CommonResult.ok();
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/entity/PeopleList.java

@@ -87,13 +87,6 @@ public class PeopleList {
     @ApiModelProperty(value = "工作地点", position = 14)
     private String workLocation;
 
-    /** 工作时间段 */
-    @ApiModelProperty(value = "工作时间段", position = 15)
-    private String workTime;
-
-    /** 工作日 */
-    @ApiModelProperty(value = "工作日", position = 16)
-    private String workDay;
 
     /** 创建人 */
     @ApiModelProperty(value = "创建人", position = 17)
@@ -117,4 +110,8 @@ public class PeopleList {
     /** 组织id */
     @ApiModelProperty(value = "组织id", position = 21)
     private String orgId;
+
+    /** 部门名称 */
+    @ApiModelProperty(value = "部门名称", position = 22)
+    private String departmentName;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/param/PeopleListAddParam.java

@@ -83,13 +83,6 @@ public class PeopleListAddParam {
     @ApiModelProperty(value = "工作地点", position = 14)
     private String workLocation;
 
-    /** 工作时间段 */
-    @ApiModelProperty(value = "工作时间段", position = 15)
-    private String workTime;
-
-    /** 工作日 */
-    @ApiModelProperty(value = "工作日", position = 16)
-    private String workDay;
 
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间", position = 18)
@@ -99,4 +92,7 @@ public class PeopleListAddParam {
     @ApiModelProperty(value = "员工照片", position = 20)
     private String imgUrl;
 
+    /** 部门名称 */
+    @ApiModelProperty(value = "部门名称", position = 21)
+    private String departmentName;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/param/PeopleListEditParam.java

@@ -87,14 +87,7 @@ public class PeopleListEditParam {
     /** 工作地点 */
     @ApiModelProperty(value = "工作地点", position = 14)
     private String workLocation;
-
-    /** 工作时间段 */
-    @ApiModelProperty(value = "工作时间段", position = 15)
-    private String workTime;
-
-    /** 工作日 */
-    @ApiModelProperty(value = "工作日", position = 16)
-    private String workDay;
+    
 
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间", position = 18)

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/service/PeopleListService.java

@@ -50,7 +50,7 @@ public interface PeopleListService extends IService<PeopleList> {
      */
     void add(String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
              String province, String address, String entryDate, Integer workStatus, String job, String department,
-             String workLocation, String workTime, String workDay, MultipartFile imgUrl,String orgId);
+             String workLocation, MultipartFile imgUrl,String orgId);
 
     /**
      * 编辑people_list
@@ -60,7 +60,7 @@ public interface PeopleListService extends IService<PeopleList> {
      */
     void edit(String id,String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
               String province, String address, String entryDate, Integer workStatus, String job, String department,
-              String workLocation, String workTime, String workDay, MultipartFile imgUrl);
+              String workLocation, MultipartFile imgUrl);
 
     /**
      * 删除people_list

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/service/impl/PeopleListServiceImpl.java

@@ -79,7 +79,7 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
     @Override
     public void add(String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
                     String province, String address, String entryDate, Integer workStatus, String job, String department,
-                    String workLocation, String workTime, String workDay, MultipartFile imgUrl,String orgId) {
+                    String workLocation, MultipartFile imgUrl,String orgId) {
         if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getNickName,nickName).eq(PeopleList::getOrgId,orgId)) > 0) {
             throw new CommonException("存在重复工号!");
         }
@@ -95,14 +95,13 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
         people.setProvince(province);
         people.setAddress(address);
         people.setEntryDate(entryDate);
-        people.setWorkDay(workDay);
         people.setWorkStatus(workStatus);
         people.setJob(job);
         QueryWrapper<Department> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", department);
-        people.setDepartment(departmentMapper.selectOne(queryWrapper).getDepartmentName());
+        people.setDepartment(department);
+        people.setDepartmentName(departmentMapper.selectOne(queryWrapper).getDepartmentName());
         people.setWorkLocation(workLocation);
-        people.setWorkTime(workTime);
         people.setPhone(phone);
         people.setOrgId(orgId);
         if (ObjectUtil.isNotEmpty(imgUrl)){
@@ -117,7 +116,7 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
     @Override
     public void edit(String id,String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
                      String province, String address, String entryDate, Integer workStatus, String job, String department,
-                     String workLocation, String workTime, String workDay, MultipartFile imgUrl) {
+                     String workLocation, MultipartFile imgUrl) {
         PeopleList people = this.queryEntity(id);
         if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getNickName,nickName).ne(PeopleList::getId,id)) > 0) {
             throw new CommonException("存在重复工号!");
@@ -133,14 +132,13 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
         people.setProvince(province);
         people.setAddress(address);
         people.setEntryDate(entryDate);
-        people.setWorkDay(workDay);
         people.setWorkStatus(workStatus);
         people.setJob(job);
         QueryWrapper<Department> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", department);
-        people.setDepartment(departmentMapper.selectOne(queryWrapper).getDepartmentName());
+        people.setDepartment(department);
+        people.setDepartmentName(departmentMapper.selectOne(queryWrapper).getDepartmentName());
         people.setWorkLocation(workLocation);
-        people.setWorkTime(workTime);
         people.setPhone(phone);
         if (ObjectUtil.isNotEmpty(imgUrl)){
             String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), imgUrl);