fix: 任务执行用户数据优化

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

@@ -47,6 +47,17 @@ public class SiteInfoController {
         return RespGenerstor.success(siteInfoService.getDataList());
     }
 
+    /**
+     * 按县区查询选择参数列表
+     * @param regionCode 县区代码
+     * @return 接口封装返回值
+     */
+    @ResponseBody
+    @GetMapping("/getDataListByRegionCode")
+    public BaseResponse<List<SelectProps>> getDataListByRegionCode(@RequestParam("regionCode") String regionCode) {
+        return RespGenerstor.success(siteInfoService.getDataListByRegionCode(regionCode));
+    }
+
     @PostMapping("getListByInstitutionID")
     public BaseResponse<Integer> getListByInstitutionID(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,@RequestParam(required = false) String institutionID) {
         return RespGenerstor.success(siteInfoService.getListByInstitutionID(pageIndex,pageSize, institutionID));

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

@@ -34,9 +34,11 @@ public class SiteUserController {
     public BaseResponse<PageInfo<SiteUserVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                                       @RequestParam(required = false) List<String> siteUserIDList,
                                                       @RequestParam(required = false) String siteUserName,
-                                                      @RequestParam(required = false) String siteID) {
+                                                      @RequestParam(required = false) String siteID,
+                                                      @RequestParam(required = false) String roleName,
+                                                      @RequestParam(required = false) String regionCode) {
 
-        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,siteUserIDList,siteUserName,siteID);
+        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,siteUserIDList,siteUserName,siteID,roleName,regionCode);
 
         return RespGenerstor.success(result);
     }
@@ -73,7 +75,7 @@ public class SiteUserController {
                                @RequestParam(required = false) List<String> siteUserIDList,
                                @RequestParam(required = false) String siteUserName,
                                @RequestParam(required = false) String siteID) throws Exception{
-        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,siteUserIDList,siteUserName,siteID);
+        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,siteUserIDList,siteUserName,siteID, null, null);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","人员名称","角色", "性别", "联系电话","所属驿站"}));
         int i = 0;

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

@@ -7,7 +7,11 @@ import java.util.List;
 
 public interface UserInfoCQuery {
 
-    List<SiteUserVo> getList(@Param("siteUserIDList") String siteUserIDList, @Param("siteUserName") String siteUserName,@Param("siteID") String siteID);
+    List<SiteUserVo> getList(@Param("siteUserIDList") String siteUserIDList,
+                             @Param("siteUserName") String siteUserName,
+                             @Param("siteID") String siteID,
+                             @Param("roleName") String roleName,
+                             @Param("regionCode") String regionCode);
 
     List<SiteUserVo> getListBySiteID(@Param("siteID") String siteID);
 }

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

@@ -63,6 +63,25 @@ public class SiteInfoImpl implements SiteInfoService {
         return dataResult;
     }
 
+    /**
+     * 按县区查询选择参数列表
+     *
+     * @param regionCode 县区代码
+     * @return 选择器参数VO
+     */
+    @Override
+    public List<SelectProps> getDataListByRegionCode(String regionCode) {
+        List<SiteInfoVo> list = getList(1, 99999, null, null, null, null, regionCode, null).getList();
+        List<SelectProps> dataResult = new ArrayList<>();
+        for (var item: list) {
+            SelectProps  itemResult = new SelectProps();
+            itemResult.setText(item.siteName);
+            itemResult.setValue(item.siteID);
+            dataResult.add(itemResult);
+        }
+        return dataResult;
+    }
+
     @Override
     public PageInfo<SiteInfoVo> getListByInstitutionID(int pageIndex, int pageSize, String institutionID) {
         PageHelper.startPage(pageIndex, pageSize);

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

@@ -47,9 +47,9 @@ public class SiteUserImpl implements SiteUserService {
     private SysUserSysRoleMapper sysUserSysRoleMapper;
 
     @Override
-    public PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName,String siteID) {
+    public PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName,String siteID, String roleName, String regionCode) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<SiteUserVo> dataList = userInfoCQuery.getList(stringUtils.ListToInSql(siteUserIDList),siteUserName,siteID);
+        List<SiteUserVo> dataList = userInfoCQuery.getList(stringUtils.ListToInSql(siteUserIDList),siteUserName,siteID, roleName, regionCode);
         PageInfo<SiteUserVo> result = new PageInfo(dataList);
         return result;
     }
@@ -70,13 +70,13 @@ public class SiteUserImpl implements SiteUserService {
         }else{
             ids.add(siteUserID);
         }
-        SiteUserVo model = userInfoCQuery.getList(stringUtils.ListToInSql(ids),null,null).stream().findFirst().orElse(null);
+        SiteUserVo model = userInfoCQuery.getList(stringUtils.ListToInSql(ids),null,null, null, null).stream().findFirst().orElse(null);
         return model;
     }
 
     @Override
     public List<SelectProps> getDataList() {
-        var dataList = getList(1,99999,null,null,null).getList();
+        var dataList = getList(1,99999,null,null,null, null, null).getList();
         List<SelectProps> dataResult = new ArrayList<>();
         for (var item: dataList) {
             SelectProps  itemResult = new SelectProps();

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

@@ -12,6 +12,13 @@ public interface SiteInfoService {
 
     List<SelectProps> getDataList();
 
+    /**
+     * 按县区查询选择参数列表
+     * @param regionCode 县区代码
+     * @return 选择器参数VO
+     */
+    List<SelectProps> getDataListByRegionCode(String regionCode);
+
     PageInfo<SiteInfoVo> getListByInstitutionID(int pageIndex, int pageSize, String institutionID);
 
     SiteInfoVo get(String siteID);

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface SiteUserService {
 
-    PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName,String siteID);
+    PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName,String siteID, String roleName, String regionCode);
 
     PageInfo<SiteUserVo> getListBySiteID(int pageIndex, int pageSize, String siteID);
 

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

@@ -7,6 +7,12 @@ public class DoTaskUserVo {
     public  String siteUserName;
     public  String genderName;
     public  String mobile;
+
+    public String siteName;
+
+    // PC端任务执行状态
+    public String taskStatusName;
+
     //勿删，手机端用到，表示某人员执行该任务的状态
     public  Integer userTaskStatus;
     public  String  userTaskStatusName;

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

@@ -66,9 +66,17 @@
         </if>
     </select>
     <select id="getWorkUserList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo">
-        select task.*,taskUser.DoTaskUserID,taskUser.UserTaskStatus,dic_taskStatus.Name as UserTaskStatusName,siteUser.SiteUserID, siteUser.SiteUserName,dic_gender.Name as GenderName,siteUser.Mobile  from  pc_dotask_user taskUser
+        select task.*,
+               taskUser.DoTaskUserID,
+               taskUser.UserTaskStatus,
+               dic_taskStatus.Name as UserTaskStatusName,
+               dic_taskStatus.Name as taskStatusName,
+               siteUser.SiteUserID, siteUser.SiteUserName,dic_gender.Name as GenderName,siteUser.Mobile,
+               site.SiteName as siteName
+        from  pc_dotask_user taskUser
         left join pc_dotask task on taskUser.DotaskID = task.DotaskID
         left join pc_site_user siteUser on taskUser.SiteUserID = siteUser.SiteUserID
+        LEFT JOIN pc_site site ON siteUser.SiteID = site.SiteID
         left join (select * from sys_dictionary_item where DictionaryCode ='TaskStatusType') dic_taskStatus on taskUser.UserTaskStatus = dic_taskStatus.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='Gender') dic_gender on siteUser.Gender = dic_gender.Value
         where 1 = 1