web-站点人员逻辑代码调整

h5app/src/views/pages/work/task/edit.vue

@@ -192,15 +192,16 @@ export default defineComponent({
     const getAllTaskUserList = async function(){
       const data:any = await getSiteUserDataList();
       allTaskUserList.value = data;
+      console.log("allTaskUserList",allTaskUserList.value);
     }
 
     const getCurTaskUserList = async function(taskID:any){
       const data:any = await  getWorkUserList(taskID);
       curTaskUserList.value = data;
+      console.log("curTaskUserList",curTaskUserList.value);
     }
 
     const loadCurTaskUserList = ()=>{
-      console.log("curTaskUserList",curTaskUserList.value);
       if(allTaskUserList.value.length>0){
           allTaskUserList.value.map(item=>{
             if(curTaskUserList.value.length>0){

src/main/java/com/hz/employmentsite/controller/baseSettings/UserInfoController.java

@@ -5,9 +5,9 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.services.service.AccountService;
-import com.hz.employmentsite.services.service.baseSettings.UserInfoService;
+import com.hz.employmentsite.services.service.baseSettings.SiteUserService;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,23 +19,23 @@ import java.util.UUID;
 
 @RestController
 @RequestMapping("/api/userInfo/")
-public class UserInfoController {
+public class SiteUserController {
 
     @Autowired
     private AccountService accountService;
 
     @Autowired
-    private UserInfoService userInfoService;
+    private SiteUserService userInfoService;
 
     @Autowired
     private ExcelHelper excelHelper;
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse<PageInfo<UserInfoVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+    public BaseResponse<PageInfo<SiteUserVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                                       @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String userName) {
 
-        PageInfo<UserInfoVo> result = userInfoService.getList(pageIndex,pageSize, primaryKey,userName);
+        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize, primaryKey,userName);
 
         return RespGenerstor.success(result);
     }
@@ -47,8 +47,8 @@ public class UserInfoController {
 
 
     @GetMapping("get")
-    public BaseResponse<UserInfoVo> get(@RequestParam(required = false) String siteUserID) {
-        UserInfoVo dataModel = new UserInfoVo();
+    public BaseResponse<SiteUserVo> get(@RequestParam(required = false) String siteUserID) {
+        SiteUserVo dataModel = new SiteUserVo();
         if (siteUserID == null || siteUserID == ""){
             dataModel.siteUserID = UUID.randomUUID().toString();
         }else{
@@ -64,7 +64,7 @@ public class UserInfoController {
     }
 
     @PostMapping("save")
-    public BaseResponse<Integer> save(@RequestBody UserInfoVo data) {
+    public BaseResponse<Integer> save(@RequestBody SiteUserVo data) {
         return RespGenerstor.success(userInfoService.save(data,accountService.getLoginUserID()));
     }
 
@@ -72,16 +72,16 @@ public class UserInfoController {
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String userName) throws Exception{
 
-        PageInfo<UserInfoVo> result = userInfoService.getList(pageIndex,pageSize,primaryKey,userName);
+        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,primaryKey,userName);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","人员名称","角色", "性别", "联系电话"}));
         int i = 0;
         List<List<Object>> rowDatas = new ArrayList();
-        for (UserInfoVo item : result.getList()) {
+        for (SiteUserVo item : result.getList()) {
             List<Object> row = new ArrayList();
             ++i;
             row.add(i);
-            row.add(item.name);
+            row.add(item.siteUserName);
             row.add(item.roleName);
             row.add(item.genderName);
             row.add(item.mobile);

src/main/java/com/hz/employmentsite/controller/taskAndLog/DoTaskController.java

@@ -11,7 +11,7 @@ import com.hz.employmentsite.util.DateUtils;
 import com.hz.employmentsite.util.ExcelHelper;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.taskAndLog.SiteUserVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/hz/employmentsite/mapper/cquery/DoTaskCQuery.java

@@ -2,7 +2,7 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.taskAndLog.SiteUserVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/hz/employmentsite/mapper/cquery/UserInfoCQuery.java

@@ -1,13 +1,13 @@
 package com.hz.employmentsite.mapper.cquery;
 
-import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface UserInfoCQuery {
 
-    List<UserInfoVo> getList(@Param("primaryKey") String primaryKey, @Param("userName") String userName);
+    List<SiteUserVo> getList(@Param("primaryKey") String primaryKey, @Param("userName") String userName);
 
-    List<UserInfoVo> getListBySiteID(@Param("siteID") String siteID);
+    List<SiteUserVo> getListBySiteID(@Param("siteID") String siteID);
 }

src/main/java/com/hz/employmentsite/model/PcSiteUser.java

@@ -5,9 +5,11 @@ import java.util.Date;
 public class PcSiteUser {
     private String siteUserID;
 
-    private String siteID;
+    private String siteUserName;
+
+    private String userID;
 
-    private String name;
+    private String siteID;
 
     private Integer gender;
 
@@ -31,20 +33,28 @@ public class PcSiteUser {
         this.siteUserID = siteUserID == null ? null : siteUserID.trim();
     }
 
-    public String getSiteID() {
-        return siteID;
+    public String getSiteUserName() {
+        return siteUserName;
     }
 
-    public void setSiteID(String siteID) {
-        this.siteID = siteID == null ? null : siteID.trim();
+    public void setSiteUserName(String siteUserName) {
+        this.siteUserName = siteUserName == null ? null : siteUserName.trim();
     }
 
-    public String getName() {
-        return name;
+    public String getUserID() {
+        return userID;
     }
 
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
+    public void setUserID(String userID) {
+        this.userID = userID == null ? null : userID.trim();
+    }
+
+    public String getSiteID() {
+        return siteID;
+    }
+
+    public void setSiteID(String siteID) {
+        this.siteID = siteID == null ? null : siteID.trim();
     }
 
     public Integer getGender() {

src/main/java/com/hz/employmentsite/model/PcSiteUserExample.java

@@ -175,143 +175,213 @@ public class PcSiteUserExample {
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDIsNull() {
-            addCriterion("SiteID is null");
+        public Criteria andSiteUserNameIsNull() {
+            addCriterion("SiteUserName is null");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDIsNotNull() {
-            addCriterion("SiteID is not null");
+        public Criteria andSiteUserNameIsNotNull() {
+            addCriterion("SiteUserName is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDEqualTo(String value) {
-            addCriterion("SiteID =", value, "siteID");
+        public Criteria andSiteUserNameEqualTo(String value) {
+            addCriterion("SiteUserName =", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotEqualTo(String value) {
-            addCriterion("SiteID <>", value, "siteID");
+        public Criteria andSiteUserNameNotEqualTo(String value) {
+            addCriterion("SiteUserName <>", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDGreaterThan(String value) {
-            addCriterion("SiteID >", value, "siteID");
+        public Criteria andSiteUserNameGreaterThan(String value) {
+            addCriterion("SiteUserName >", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDGreaterThanOrEqualTo(String value) {
-            addCriterion("SiteID >=", value, "siteID");
+        public Criteria andSiteUserNameGreaterThanOrEqualTo(String value) {
+            addCriterion("SiteUserName >=", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDLessThan(String value) {
-            addCriterion("SiteID <", value, "siteID");
+        public Criteria andSiteUserNameLessThan(String value) {
+            addCriterion("SiteUserName <", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDLessThanOrEqualTo(String value) {
-            addCriterion("SiteID <=", value, "siteID");
+        public Criteria andSiteUserNameLessThanOrEqualTo(String value) {
+            addCriterion("SiteUserName <=", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDLike(String value) {
-            addCriterion("SiteID like", value, "siteID");
+        public Criteria andSiteUserNameLike(String value) {
+            addCriterion("SiteUserName like", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotLike(String value) {
-            addCriterion("SiteID not like", value, "siteID");
+        public Criteria andSiteUserNameNotLike(String value) {
+            addCriterion("SiteUserName not like", value, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDIn(List<String> values) {
-            addCriterion("SiteID in", values, "siteID");
+        public Criteria andSiteUserNameIn(List<String> values) {
+            addCriterion("SiteUserName in", values, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotIn(List<String> values) {
-            addCriterion("SiteID not in", values, "siteID");
+        public Criteria andSiteUserNameNotIn(List<String> values) {
+            addCriterion("SiteUserName not in", values, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDBetween(String value1, String value2) {
-            addCriterion("SiteID between", value1, value2, "siteID");
+        public Criteria andSiteUserNameBetween(String value1, String value2) {
+            addCriterion("SiteUserName between", value1, value2, "siteUserName");
             return (Criteria) this;
         }
 
-        public Criteria andSiteIDNotBetween(String value1, String value2) {
-            addCriterion("SiteID not between", value1, value2, "siteID");
+        public Criteria andSiteUserNameNotBetween(String value1, String value2) {
+            addCriterion("SiteUserName not between", value1, value2, "siteUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDIsNull() {
+            addCriterion("UserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDIsNotNull() {
+            addCriterion("UserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDEqualTo(String value) {
+            addCriterion("UserID =", value, "userID");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDNotEqualTo(String value) {
+            addCriterion("UserID <>", value, "userID");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDGreaterThan(String value) {
+            addCriterion("UserID >", value, "userID");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("UserID >=", value, "userID");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIDLessThan(String value) {
+            addCriterion("UserID <", value, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameIsNull() {
-            addCriterion("Name is null");
+        public Criteria andUserIDLessThanOrEqualTo(String value) {
+            addCriterion("UserID <=", value, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameIsNotNull() {
-            addCriterion("Name is not null");
+        public Criteria andUserIDLike(String value) {
+            addCriterion("UserID like", value, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameEqualTo(String value) {
-            addCriterion("Name =", value, "name");
+        public Criteria andUserIDNotLike(String value) {
+            addCriterion("UserID not like", value, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameNotEqualTo(String value) {
-            addCriterion("Name <>", value, "name");
+        public Criteria andUserIDIn(List<String> values) {
+            addCriterion("UserID in", values, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameGreaterThan(String value) {
-            addCriterion("Name >", value, "name");
+        public Criteria andUserIDNotIn(List<String> values) {
+            addCriterion("UserID not in", values, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("Name >=", value, "name");
+        public Criteria andUserIDBetween(String value1, String value2) {
+            addCriterion("UserID between", value1, value2, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameLessThan(String value) {
-            addCriterion("Name <", value, "name");
+        public Criteria andUserIDNotBetween(String value1, String value2) {
+            addCriterion("UserID not between", value1, value2, "userID");
             return (Criteria) this;
         }
 
-        public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("Name <=", value, "name");
+        public Criteria andSiteIDIsNull() {
+            addCriterion("SiteID is null");
             return (Criteria) this;
         }
 
-        public Criteria andNameLike(String value) {
-            addCriterion("Name like", value, "name");
+        public Criteria andSiteIDIsNotNull() {
+            addCriterion("SiteID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andNameNotLike(String value) {
-            addCriterion("Name not like", value, "name");
+        public Criteria andSiteIDEqualTo(String value) {
+            addCriterion("SiteID =", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andNameIn(List<String> values) {
-            addCriterion("Name in", values, "name");
+        public Criteria andSiteIDNotEqualTo(String value) {
+            addCriterion("SiteID <>", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andNameNotIn(List<String> values) {
-            addCriterion("Name not in", values, "name");
+        public Criteria andSiteIDGreaterThan(String value) {
+            addCriterion("SiteID >", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("Name between", value1, value2, "name");
+        public Criteria andSiteIDGreaterThanOrEqualTo(String value) {
+            addCriterion("SiteID >=", value, "siteID");
             return (Criteria) this;
         }
 
-        public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("Name not between", value1, value2, "name");
+        public Criteria andSiteIDLessThan(String value) {
+            addCriterion("SiteID <", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDLessThanOrEqualTo(String value) {
+            addCriterion("SiteID <=", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDLike(String value) {
+            addCriterion("SiteID like", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotLike(String value) {
+            addCriterion("SiteID not like", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDIn(List<String> values) {
+            addCriterion("SiteID in", values, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotIn(List<String> values) {
+            addCriterion("SiteID not in", values, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDBetween(String value1, String value2) {
+            addCriterion("SiteID between", value1, value2, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotBetween(String value1, String value2) {
+            addCriterion("SiteID not between", value1, value2, "siteID");
             return (Criteria) this;
         }
 

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteInfoImpl.java

@@ -11,8 +11,7 @@ import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
-import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
-import com.hz.employmentsite.vo.taskAndLog.SiteUserVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo; 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -137,7 +136,7 @@ public class SiteInfoImpl implements SiteInfoService {
         }
         /*修改站点人员信息*/
         if(data.manageUsers.size() > 0){
-            List<UserInfoVo> manageUsers = data.manageUsers.stream().toList();
+            List<SiteUserVo> manageUsers = data.manageUsers.stream().toList();
             for (var curData: manageUsers) {
                 PcSiteUser curUserData = pcSiteUserMapper.selectByPrimaryKey(curData.getSiteUserID());
                 curUserData.setSiteID(curData.getSiteID());

src/main/java/com/hz/employmentsite/services/impl/baseSettings/UserInfoImpl.java

@@ -7,10 +7,9 @@ import com.hz.employmentsite.mapper.cquery.UserInfoCQuery;
 import com.hz.employmentsite.model.PcSiteUser;
 import com.hz.employmentsite.model.PcSiteUserExample;
 import com.hz.employmentsite.model.SelectProps;
-import com.hz.employmentsite.services.service.baseSettings.UserInfoService;
+import com.hz.employmentsite.services.service.baseSettings.SiteUserService;
 import com.hz.employmentsite.util.StringUtils;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
-import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +18,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service("UserInfoService")
-public class UserInfoImpl implements UserInfoService {
+public class SiteUserImpl implements SiteUserService {
 
     @Autowired
     private UserInfoCQuery userInfoCQuery;
@@ -30,27 +29,27 @@ public class UserInfoImpl implements UserInfoService {
     @Autowired
     private PcSiteUserMapper pcSiteUserMapper;
     @Override
-    public PageInfo<UserInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String userName) {
+    public PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, String primaryKey, String userName) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<UserInfoVo> dataList = userInfoCQuery.getList(primaryKey,userName);
-        PageInfo<UserInfoVo> result = new PageInfo(dataList);
+        List<SiteUserVo> dataList = userInfoCQuery.getList(primaryKey,userName);
+        PageInfo<SiteUserVo> result = new PageInfo(dataList);
         return result;
     }
 
     @Override
-    public PageInfo<UserInfoVo> getListBySiteID(int pageIndex, int pageSize, String siteID) {
+    public PageInfo<SiteUserVo> getListBySiteID(int pageIndex, int pageSize, String siteID) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<UserInfoVo> dataList = userInfoCQuery.getListBySiteID(siteID);
-        PageInfo<UserInfoVo> result = new PageInfo(dataList);
+        List<SiteUserVo> dataList = userInfoCQuery.getListBySiteID(siteID);
+        PageInfo<SiteUserVo> result = new PageInfo(dataList);
         return result;
     }
 
     @Override
-    public UserInfoVo get(String siteUserID) {
+    public SiteUserVo get(String siteUserID) {
         List<String> ids = new ArrayList<>();
         ids.add(siteUserID);
         String sqlPrimaryKey = stringUtils.ListToInSql(ids);
-        UserInfoVo model = userInfoCQuery.getList(sqlPrimaryKey,null).stream().findFirst().orElse(null);
+        SiteUserVo model = userInfoCQuery.getList(sqlPrimaryKey,null).stream().findFirst().orElse(null);
         return model;
     }
 
@@ -60,7 +59,7 @@ public class UserInfoImpl implements UserInfoService {
         List<SelectProps> dataResult = new ArrayList<>();
         for (var item: dataList) {
             SelectProps  itemResult = new SelectProps();
-            itemResult.setText(item.name);
+            itemResult.setText(item.siteUserName);
             itemResult.setValue(item.siteUserID);
             dataResult.add(itemResult);
         }
@@ -68,9 +67,9 @@ public class UserInfoImpl implements UserInfoService {
     }
 
     @Override
-    public Integer save(UserInfoVo data, String userId) {
+    public Integer save(SiteUserVo data, String userId) {
         int result = 0;
-        UserInfoVo record = get(data.siteUserID);
+        SiteUserVo record = get(data.siteUserID);
         PcSiteUser dbData = record ==null ? null : pcSiteUserMapper.selectByPrimaryKey(record.siteUserID);
         Boolean isExist = dbData != null;
         if (!isExist) {
@@ -79,7 +78,7 @@ public class UserInfoImpl implements UserInfoService {
             dbData.setSiteUserID(data.getSiteUserID());
             dbData.setSiteID(data.getSiteID());
             dbData.setGender(data.getGender());
-            dbData.setName(data.getName());
+            dbData.setSiteUserName(data.getSiteUserName());
             dbData.setGender(data.getGender());
             dbData.setRoleID(data.getRoleID());
             dbData.setMobile(data.getMobile());
@@ -91,7 +90,7 @@ public class UserInfoImpl implements UserInfoService {
             dbData.setSiteUserID(data.siteUserID);
             dbData.setSiteID(data.getSiteID());
             dbData.setGender(data.gender);
-            dbData.setName(data.name);
+            dbData.setSiteUserName(data.siteUserName);
             dbData.setGender(data.gender);
             dbData.setRoleID(data.roleID);
             dbData.setMobile(data.mobile);

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoTaskImpl.java

@@ -10,7 +10,7 @@ import com.hz.employmentsite.services.service.taskAndLog.DoTaskService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.taskAndLog.SiteUserVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/hz/employmentsite/services/service/baseSettings/UserInfoService.java

@@ -2,22 +2,22 @@ package com.hz.employmentsite.services.service.baseSettings;
 
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.model.SelectProps;
-import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 
 import java.util.List;
 
 
-public interface UserInfoService {
+public interface SiteUserService {
 
-    PageInfo<UserInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String userName);
+    PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, String primaryKey, String userName);
 
-    PageInfo<UserInfoVo> getListBySiteID(int pageIndex, int pageSize, String siteID);
+    PageInfo<SiteUserVo> getListBySiteID(int pageIndex, int pageSize, String siteID);
 
-    UserInfoVo get(String siteUserID);
+    SiteUserVo get(String siteUserID);
 
     List<SelectProps> getDataList();
 
-    Integer save(UserInfoVo data, String userId);
+    Integer save(SiteUserVo data, String userId);
 
     Integer delete(List<String> idList);
 }

src/main/java/com/hz/employmentsite/services/service/taskAndLog/DoTaskService.java

@@ -3,7 +3,7 @@ package com.hz.employmentsite.services.service.taskAndLog;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.taskAndLog.SiteUserVo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import java.util.List;
 
 public interface DoTaskService {

src/main/java/com/hz/employmentsite/vo/baseSettings/SiteInfoVo.java

@@ -25,7 +25,7 @@ public class SiteInfoVo {
     public String siteInstitutionID;
     public String institutionID;
     public String institutionName;
-    public List<UserInfoVo> manageUsers;
+    public List<SiteUserVo> manageUsers;
     public Integer userCount;
 
     public String createUserID;

src/main/java/com/hz/employmentsite/vo/baseSettings/UserInfoVo.java

@@ -4,11 +4,11 @@ import lombok.Data;
 import java.sql.Date;
 
 @Data
-public class UserInfoVo {
+public class SiteUserVo {
 
     public String siteUserID;
     public String siteID;
-    public String name;
+    public String siteUserName;
     public Integer gender;
     public String genderName;
     public String mobile;

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoTaskVo.java

@@ -1,10 +1,9 @@
 package com.hz.employmentsite.vo.taskAndLog;
 
 import lombok.Data;
-
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 
 @Data
 public class DoTaskVo {

src/main/java/com/hz/employmentsite/vo/taskAndLog/SiteUserVo.java

@@ -1,6 +0,0 @@
-package com.hz.employmentsite.vo.taskAndLog;
-
-public class SiteUserVo {
-    public String siteUserID;
-    public String name;
-}

src/main/resources/mapping/PcSiteUserMapper.xml

@@ -3,8 +3,9 @@
 <mapper namespace="com.hz.employmentsite.mapper.PcSiteUserMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcSiteUser">
     <id column="SiteUserID" jdbcType="VARCHAR" property="siteUserID" />
+    <result column="SiteUserName" jdbcType="VARCHAR" property="siteUserName" />
+    <result column="UserID" jdbcType="VARCHAR" property="userID" />
     <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
-    <result column="Name" jdbcType="VARCHAR" property="name" />
     <result column="Gender" jdbcType="INTEGER" property="gender" />
     <result column="Mobile" jdbcType="VARCHAR" property="mobile" />
     <result column="RoleID" jdbcType="INTEGER" property="roleID" />
@@ -72,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    SiteUserID, SiteID, Name, Gender, Mobile, RoleID, CreateUserID, CreateTime, UpdateBy, 
-    UpdateTime
+    SiteUserID, SiteUserName, UserID, SiteID, Gender, Mobile, RoleID, CreateUserID, CreateTime, 
+    UpdateBy, UpdateTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcSiteUserExample" resultMap="BaseResultMap">
     select
@@ -106,14 +107,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcSiteUser">
-    insert into pc_site_user (SiteUserID, SiteID, Name, 
-      Gender, Mobile, RoleID, 
-      CreateUserID, CreateTime, UpdateBy, 
-      UpdateTime)
-    values (#{siteUserID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{gender,jdbcType=INTEGER}, #{mobile,jdbcType=VARCHAR}, #{roleID,jdbcType=INTEGER}, 
-      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into pc_site_user (SiteUserID, SiteUserName, UserID, 
+      SiteID, Gender, Mobile, 
+      RoleID, CreateUserID, CreateTime, 
+      UpdateBy, UpdateTime)
+    values (#{siteUserID,jdbcType=VARCHAR}, #{siteUserName,jdbcType=VARCHAR}, #{userID,jdbcType=VARCHAR}, 
+      #{siteID,jdbcType=VARCHAR}, #{gender,jdbcType=INTEGER}, #{mobile,jdbcType=VARCHAR}, 
+      #{roleID,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcSiteUser">
     insert into pc_site_user
@@ -121,12 +122,15 @@
       <if test="siteUserID != null">
         SiteUserID,
       </if>
+      <if test="siteUserName != null">
+        SiteUserName,
+      </if>
+      <if test="userID != null">
+        UserID,
+      </if>
       <if test="siteID != null">
         SiteID,
       </if>
-      <if test="name != null">
-        Name,
-      </if>
       <if test="gender != null">
         Gender,
       </if>
@@ -153,12 +157,15 @@
       <if test="siteUserID != null">
         #{siteUserID,jdbcType=VARCHAR},
       </if>
+      <if test="siteUserName != null">
+        #{siteUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="userID != null">
+        #{userID,jdbcType=VARCHAR},
+      </if>
       <if test="siteID != null">
         #{siteID,jdbcType=VARCHAR},
       </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
       <if test="gender != null">
         #{gender,jdbcType=INTEGER},
       </if>
@@ -194,12 +201,15 @@
       <if test="row.siteUserID != null">
         SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
       </if>
+      <if test="row.siteUserName != null">
+        SiteUserName = #{row.siteUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="row.userID != null">
+        UserID = #{row.userID,jdbcType=VARCHAR},
+      </if>
       <if test="row.siteID != null">
         SiteID = #{row.siteID,jdbcType=VARCHAR},
       </if>
-      <if test="row.name != null">
-        Name = #{row.name,jdbcType=VARCHAR},
-      </if>
       <if test="row.gender != null">
         Gender = #{row.gender,jdbcType=INTEGER},
       </if>
@@ -229,8 +239,9 @@
   <update id="updateByExample" parameterType="map">
     update pc_site_user
     set SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
+      SiteUserName = #{row.siteUserName,jdbcType=VARCHAR},
+      UserID = #{row.userID,jdbcType=VARCHAR},
       SiteID = #{row.siteID,jdbcType=VARCHAR},
-      Name = #{row.name,jdbcType=VARCHAR},
       Gender = #{row.gender,jdbcType=INTEGER},
       Mobile = #{row.mobile,jdbcType=VARCHAR},
       RoleID = #{row.roleID,jdbcType=INTEGER},
@@ -245,12 +256,15 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.PcSiteUser">
     update pc_site_user
     <set>
+      <if test="siteUserName != null">
+        SiteUserName = #{siteUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="userID != null">
+        UserID = #{userID,jdbcType=VARCHAR},
+      </if>
       <if test="siteID != null">
         SiteID = #{siteID,jdbcType=VARCHAR},
       </if>
-      <if test="name != null">
-        Name = #{name,jdbcType=VARCHAR},
-      </if>
       <if test="gender != null">
         Gender = #{gender,jdbcType=INTEGER},
       </if>
@@ -277,8 +291,9 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcSiteUser">
     update pc_site_user
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-      Name = #{name,jdbcType=VARCHAR},
+    set SiteUserName = #{siteUserName,jdbcType=VARCHAR},
+      UserID = #{userID,jdbcType=VARCHAR},
+      SiteID = #{siteID,jdbcType=VARCHAR},
       Gender = #{gender,jdbcType=INTEGER},
       Mobile = #{mobile,jdbcType=VARCHAR},
       RoleID = #{roleID,jdbcType=INTEGER},

src/main/resources/mapping/cquery/DoTaskCQuery.xml

@@ -39,20 +39,17 @@
     </select>
 
     <select id="getWorkUserList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo">
-        select su.`Name` as userName, u.*
-        from pc_dotask_user u
-        left join pc_dotask tk
-        on u.DotaskID = tk.DotaskID
-        left join pc_site_user su
-        on su.SiteUserID = u.SiteUserID
+        select su.SiteUserName as userName, u.* from pc_dotask_user u
+        left join pc_dotask tk on u.DotaskID = tk.DotaskID
+        left join pc_site_user su on su.SiteUserID = u.SiteUserID
         where 1 = 1
         <if test="doTaskID!='' and doTaskID!=null">
             and u.DotaskID = #{doTaskID}
         </if>
 
     </select>
-    <select id="getUserList" resultType="com.hz.employmentsite.vo.taskAndLog.SiteUserVo">
-        select SiteUserID, `Name`
+    <select id="getUserList" resultType="com.hz.employmentsite.vo.baseSettings.SiteUserVo">
+        select SiteUserID, SiteUserName
         from pc_site_user;
     </select>
 </mapper>

src/main/resources/mapping/cquery/UserInfoCQuery.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.cquery.UserInfoCQuery">
-    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.UserInfoVo">
+    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.SiteUserVo">
         select siteUser.*,dic_userRole.Name as RoleName,dic_gender.Name as GenderName  from pc_site_user siteUser
-        left join (select * from sys_dictionary_item where DictionaryCode ='SiteUserRole' ) dic_userRole  on siteUser.RoleID = dic_userRole.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='UserType' ) dic_userRole  on siteUser.RoleID = dic_userRole.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='Gender' ) dic_gender  on siteUser.Gender = dic_gender.Value
         where 1=1
         <if test="primaryKey!='' and primaryKey!=null">
@@ -15,9 +15,9 @@
 
     </select>
 
-    <select id="getListBySiteID" resultType="com.hz.employmentsite.vo.baseSettings.UserInfoVo">
+    <select id="getListBySiteID" resultType="com.hz.employmentsite.vo.baseSettings.SiteUserVo">
         select siteUser.*,dic_userRole.Name as RoleName,dic_gender.Name as GenderName from pc_site_user siteUser
-        left join (select * from sys_dictionary_item where DictionaryCode ='SiteUserRole' ) dic_userRole  on siteUser.RoleID = dic_userRole.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='UserType' ) dic_userRole  on siteUser.RoleID = dic_userRole.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='Gender' ) dic_gender  on siteUser.Gender = dic_gender.Value
         where 1=1
         <if test="siteID!='' and siteID!=null">

vue/src/router/asyncModules/basesettings.ts

@@ -1,8 +1,8 @@
 export default {
   'baseSettings/institution/index': () => import('@/views/baseSettings/institution/index.vue'),
   'baseSettings/institution/edit': () => import('@/views/baseSettings/institution/edit.vue'),
-  'baseSettings/site/index': () => import('@/views/baseSettings/site/index.vue'),
-  'baseSettings/site/edit': () => import('@/views/baseSettings/site/edit.vue'),
-  'baseSettings/user/index': () => import('@/views/baseSettings/user/index.vue'),
-  'baseSettings/user/edit': () => import('@/views/baseSettings/user/edit.vue'),
+  'baseSettings/site/index': () => import('@/views/baseSettings/siteInfo/index.vue'),
+  'baseSettings/site/edit': () => import('@/views/baseSettings/siteInfo/edit.vue'),
+  'baseSettings/user/index': () => import('@/views/baseSettings/siteUser/index.vue'),
+  'baseSettings/user/edit': () => import('@/views/baseSettings/siteUser/edit.vue'),
 };

vue/src/views/baseSettings/site/edit.vue

@@ -100,14 +100,14 @@
                    :row-key="record=>record.siteId"
                    bordered>
             <template #bodyCell="{ column ,index}">
-              <template v-if="column.key === 'name'">
+              <template v-if="column.key === 'siteUserName'">
                 <div>
                   <a-select
                     ref="select"
                     v-model:value="manageUsers[index][column.key]"
                     :options="allUsers"
                     @change="manageUsersChange(index,manageUsers[index][column.key])"
-                    :field-names="{ label: 'name', value: 'siteUserID' }" style="width: 200px" >
+                    :field-names="{ label: 'siteUserName', value: 'siteUserID' }" style="width: 200px" >
                   </a-select>
                 </div>
               </template>
@@ -173,7 +173,7 @@ export default defineComponent({
     });
     const columns: TableColumnsType = [
       {title: '序号', align: "center",key: 'siteUserID',customRender: item => `${pageParams.pageSize * (pageParams.pageIndex - 1) + item.index + 1}`},
-      {title: '姓名', dataIndex: 'name', key: 'name', align: "center"},
+      {title: '姓名', dataIndex: 'siteUserName', key: 'siteUserName', align: "center"},
       {title: '性别', dataIndex: 'genderName', key: 'genderName', align: "center"},
       {title: '角色', dataIndex: 'roleName', key: 'roleName', align: "center"},
       {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},
@@ -229,6 +229,7 @@ export default defineComponent({
         formData.dataModel = result;
         console.log("dataModel",formData.dataModel);
         getManageUsers(formData.dataModel.siteID);
+        console.log("manageUsers",manageUsers.value);
         if (formData.dataModel.regionCode != null){
           getStreetList();
         }
@@ -265,7 +266,8 @@ export default defineComponent({
     const addSiteUser = () => {
       if(allUsers.value.length >0){
         const newUser = allUsers.value[0];
-        (manageUsers.value as any[]).push({siteUserID:newUser.siteUserID,siteID:formData.dataModel.siteID,name:newUser.name,genderName:newUser.genderName,roleName:newUser.roleName});
+        console.log(newUser);
+        (manageUsers.value as any[]).push({siteUserID:newUser.siteUserID,siteID:formData.dataModel.siteID,siteUserName:newUser.siteUserName,genderName:newUser.genderName,roleName:newUser.roleName});
         validateSameUser();
       }else{
         message.error("未查询到站点信息!");

vue/src/views/baseSettings/site/index.vue

@@ -105,7 +105,7 @@ import type {FormInstance} from 'ant-design-vue';
 import type {TableColumnsType, TableProps} from 'ant-design-vue';
 import {getSiteList,delSite} from '@/api/baseSettings/siteInfo';
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
-import SiteInfoEditForm from "@/views/baseSettings/site/edit.vue";
+import SiteInfoEditForm from "@/views/baseSettings/siteInfo/edit.vue";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
 import {message, Modal, SelectProps} from "ant-design-vue";

vue/src/views/baseSettings/user/edit.vue

@@ -14,9 +14,9 @@
       <a-divider orientation="left">基础信息</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="name" :label-col="{span:7}" :rules="[{ required: true, message: '请输入人员姓名!' }]">
-            <label v-if="opCategory==3">{{dataModel.name}}</label>
-            <a-input v-model:value="dataModel.name" placeholder=""/>
+          <a-form-item label="姓名" name="siteUserName" :label-col="{span:7}" :rules="[{ required: true, message: '请输入人员姓名!' }]">
+            <label v-if="opCategory==3">{{dataModel.siteUserName}}</label>
+            <a-input v-model:value="dataModel.siteUserName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -90,7 +90,7 @@ export default defineComponent({
       genderList.value = genderResult;
     }
     const getRoleList = async function(){
-      const roleResult :any = await getSysDictionaryList("SiteUserRole");
+      const roleResult :any = await getSysDictionaryList("UserType");
       roleList.value = roleResult;
     }
 
@@ -114,7 +114,7 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      if(formData.dataModel.name==null||formData.dataModel.gender ==null||formData.dataModel.mobile==null|| formData.dataModel.roleID==null){
+      if(formData.dataModel.siteUserName==null||formData.dataModel.gender ==null||formData.dataModel.mobile==null|| formData.dataModel.roleID==null){
         message.error("请填写完整的人员信息!");
         isAllowCommit.value = false;
       }

vue/src/views/baseSettings/user/index.vue

@@ -60,7 +60,7 @@ import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from '@ant-design/i
 import type {FormInstance} from 'ant-design-vue';
 import type {TableColumnsType, TableProps} from 'ant-design-vue';
 import {getSiteUserList,delSiteUser} from '@/api/baseSettings/userInfo';
-import UserInfoEditForm from "@/views/baseSettings/user/edit.vue";
+import UserInfoEditForm from "@/views/baseSettings/siteUser/edit.vue";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
 import {message, Modal} from "ant-design-vue";
@@ -83,7 +83,7 @@ export default defineComponent({
     });
     const columns: TableColumnsType = [
       {title: '序号', align: "center",key: 'siteUserID',customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`},
-      {title: '人员名称', dataIndex: 'name', key: 'name', align: "center"},
+      {title: '人员名称', dataIndex: 'siteUserName', key: 'siteUserName', align: "center"},
       {title: '角色', dataIndex: 'roleName', key: 'roleName',width:120, align: "center"},
       {title: '性别', dataIndex: 'genderName', key: 'genderName', align: "center"},
       {title: '联系电话', dataIndex: 'mobile', key: 'mobile', align: "center"},

vue/src/views/companyService/company/edit.vue

@@ -256,6 +256,7 @@ import {get} from "@/api/common";
 import {save, getCompanyById} from '@/api/companyService/company';
 import {getSiteByID} from '@/api/baseSettings/siteInfo';
 import {getSysDictionaryList} from '@/api/system/dictionary';
+import dayjs from "dayjs";
 
 interface FormState {
   dataModel: any;
@@ -271,7 +272,8 @@ export default defineComponent(
       const tabsViewStore = useTabsViewStore();
       const showPicker = ref<boolean>(false);
       const showDataPicker = ()=>{
-        formState.dataModel.validTime ='2023-01-01';
+        let toDay = new Date();
+        formState.dataModel.validTime = dayjs(toDay.toLocaleDateString().replaceAll("/","-")) ;
         showPicker.value = true;
       }
       const companyStatusList = ref<SelectProps['options']>([

vue/src/views/companyService/post/edit.vue

@@ -243,7 +243,7 @@
             label="试用期最低薪酬"
             :label-col="{ span: 6 }"
             name="trailMinSalary"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '请输入试用期最低薪酬!' }]"
           >
             <a-input v-model:value="dataModel.trailMinSalary" placeholder=""/>
           </a-form-item>

vue/src/views/taskAndLog/dotask/edit.vue

@@ -103,7 +103,7 @@
                     ref="select"
                     v-model:value="userData[index][column.key]"
                     :options="siteUserList"
-                    :field-names="{ label: 'name', value: 'siteUserID' }"
+                    :field-names="{ label: 'siteUserName', value: 'siteUserID' }"
                     :allow-clear="true" style="width: 200px"
                   >
                   </a-select>