web-导出数据查询逻辑调整

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.hz.employmentsite.EmploymentSiteApplication
-

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

@@ -31,10 +31,10 @@ public class InstitutionController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<InstitutionVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                         @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
+                                                         @RequestParam(required = false) List<String> institutionIDList, @RequestParam(required = false) String companyName,
                                                          @RequestParam(required = false) String companyAddress, @RequestParam(required = false) String dutyUserName) {
 
-        PageInfo<InstitutionVo> result = institutionService.getList(pageIndex,pageSize,primaryKey,companyName,companyAddress,dutyUserName);
+        PageInfo<InstitutionVo> result = institutionService.getList(pageIndex,pageSize,institutionIDList,companyName,companyAddress,dutyUserName);
 
         return RespGenerstor.success(result);
     }
@@ -66,14 +66,14 @@ public class InstitutionController {
 
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                               @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
+                               @RequestParam(required = false) List<String> institutionIDList, @RequestParam(required = false) String companyName,
                                @RequestParam(required = false) String companyAddress, @RequestParam(required = false) String dutyUserName) throws Exception{
 
-        PageInfo<InstitutionVo> result = institutionService.getList(pageIndex,pageSize,primaryKey,companyName,companyAddress,dutyUserName);
+        PageInfo<InstitutionVo> result = institutionService.getList(pageIndex,pageSize,institutionIDList,companyName,companyAddress,dutyUserName);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","企业名称","企业地址", "负责人姓名", "负责人电话","法人姓名", "法人电话", "企业机构代码", "管理驿站数量"}));
         int i = 0;
-        List<List<Object>> rowDatas = new ArrayList();
+        List<List<Object>> rowsData = new ArrayList();
         for (InstitutionVo item : result.getList()) {
             List<Object> row = new ArrayList();
             ++i;
@@ -86,9 +86,9 @@ public class InstitutionController {
             row.add(item.frMobile);
             row.add(item.companyCode);
             row.add(item.siteCount);
-            rowDatas.add(row);
+            rowsData.add(row);
         }
-        data.setRows(rowDatas);
+        data.setRows(rowsData);
         excelHelper.exportExcel(response, data);
         return null;
     }

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

@@ -33,11 +33,11 @@ public class SiteInfoController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<SiteInfoVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                      @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String siteCode,
+                                                      @RequestParam(required = false) List<String> siteIDList, @RequestParam(required = false) String siteCode,
                                                       @RequestParam(required = false) String siteName, @RequestParam(required = false) String institutionName,
                                                       @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
 
-        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,siteIDList,siteCode,siteName,institutionName,regionCode,streetCode);
 
         return RespGenerstor.success(result);
     }
@@ -73,15 +73,15 @@ public class SiteInfoController {
 
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                               @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String siteCode,
+                               @RequestParam(required = false) List<String> siteIDList, @RequestParam(required = false) String siteCode,
                                @RequestParam(required = false) String siteName, @RequestParam(required = false) String institutionName,
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) throws Exception{
 
-        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,siteIDList,siteCode,siteName,institutionName,regionCode,streetCode);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-        data.setTitles(Arrays.asList(new String[]{"序号","驿站编号","站点名称", "站点负责人", "联系电话","所属县区", "所属街道", "详细地址", "所属机构","驿站人员数量"}));
+        data.setTitles(Arrays.asList(new String[]{"序号","驿站编号","站点名称", "站点负责人", "联系电话","所属县区", "所属街道", "详细地址", "所属机构","驿站人员"}));
         int i = 0;
-        List<List<Object>> rowDatas = new ArrayList();
+        List<List<Object>> rowsData= new ArrayList();
         for (SiteInfoVo item : result.getList()) {
             List<Object> row = new ArrayList();
             ++i;
@@ -94,10 +94,10 @@ public class SiteInfoController {
             row.add(item.streetName);
             row.add(item.detailAddress);
             row.add(item.institutionName);
-            row.add(item.userCount);
-            rowDatas.add(row);
+            row.add(item.siteUsers);
+            rowsData.add(row);
         }
-        data.setRows(rowDatas);
+        data.setRows(rowsData);
         excelHelper.exportExcel(response, data);
         return null;
     }

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

@@ -33,9 +33,11 @@ public class SiteUserController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<SiteUserVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                      @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String userName) {
+                                                      @RequestParam(required = false) List<String> siteUserIDList,
+                                                      @RequestParam(required = false) String userName,
+                                                      @RequestParam(required = false) String siteID) {
 
-        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize, primaryKey,userName);
+        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,siteUserIDList,userName,siteID);
 
         return RespGenerstor.success(result);
     }
@@ -70,13 +72,14 @@ public class SiteUserController {
 
     @GetMapping("export")
     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<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,primaryKey,userName);
+                               @RequestParam(required = false) List<String> siteUserIDList,
+                               @RequestParam(required = false) String userName,
+                               @RequestParam(required = false) String siteID) throws Exception{
+        PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex,pageSize,siteUserIDList,userName,siteID);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-        data.setTitles(Arrays.asList(new String[]{"序号","人员名称","角色", "性别", "联系电话"}));
+        data.setTitles(Arrays.asList(new String[]{"序号","人员名称","角色", "性别", "联系电话","所属驿站"}));
         int i = 0;
-        List<List<Object>> rowDatas = new ArrayList();
+        List<List<Object>> rowsData= new ArrayList();
         for (SiteUserVo item : result.getList()) {
             List<Object> row = new ArrayList();
             ++i;
@@ -85,9 +88,10 @@ public class SiteUserController {
             row.add(item.roleName);
             row.add(item.genderName);
             row.add(item.mobile);
-            rowDatas.add(row);
+            row.add(item.siteName);
+            rowsData.add(row);
         }
-        data.setRows(rowDatas);
+        data.setRows(rowsData);
         excelHelper.exportExcel(response, data);
         return null;
     }

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -37,11 +37,11 @@ public class CompanyController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<CompanyVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                     @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
+                                                     @RequestParam(required = false) List<String> companyIDList, @RequestParam(required = false) String companyName,
                                                      @RequestParam(required = false) String companyCode, @RequestParam(required = false) String recordStatus,
                                                      @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
 
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, primaryKey, companyName, companyCode, recordStatus, regionCode, streetCode);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode);
 
         return RespGenerstor.success(result);
     }
@@ -81,11 +81,11 @@ public class CompanyController {
     @GetMapping("/export")
     public BaseResponse export(HttpServletResponse response, @RequestParam(required = false) Boolean isExport,
                                @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") Integer pageSize,
-                               @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
+                               @RequestParam(required = false) List<String> companyIDList, @RequestParam(required = false) String companyName,
                                @RequestParam(required = false) String companyCode, @RequestParam(required = false) String recordStatus,
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode
     ) throws Exception {
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, primaryKey, companyName, companyCode, recordStatus, regionCode, streetCode);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -32,7 +32,7 @@ public class PostController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                @RequestParam(required = false) String postID,
+                                @RequestParam(required = false) List<String> postIDList,
                                 @RequestParam(required = false) String postName,
                                 @RequestParam(required = false) Integer minCount,
                                 @RequestParam(required = false) Integer maxCount,
@@ -42,7 +42,7 @@ public class PostController {
                                 @RequestParam(required = false) String companyID
                                 ) {
 
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postID, postName, minCount, maxCount, companyName, recordStatus, workName,companyID);
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, postName, minCount, maxCount, companyName, recordStatus, workName,companyID);
         return RespGenerstor.success(result);
     }
 
@@ -88,6 +88,7 @@ public class PostController {
             data.postID = UUID.randomUUID().toString();
             data.startTime = new Date();
             data.endTime = new Date();
+            data.recordStatus =1;
         }
         return RespGenerstor.success(data);
     }
@@ -104,13 +105,14 @@ public class PostController {
     @GetMapping("/export")
     public BaseResponse export(HttpServletResponse response, @RequestParam(required = false) Boolean isExport,
                                @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                               @RequestParam(required = false) List<String> postIDList,
                                @RequestParam(required = false) String postName,
                                @RequestParam(required = false) Integer minCount,
                                @RequestParam(required = false) Integer maxCount,
                                @RequestParam(required = false) String companyName,
                                @RequestParam(required = false) String recordStatus,
                                @RequestParam(required = false) String workName) throws Exception {
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, null, postName, minCount, maxCount, companyName, recordStatus, workName,null);
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, postName, minCount, maxCount, companyName, recordStatus, workName,null);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
@@ -119,7 +121,7 @@ public class PostController {
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
             data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "招聘人数","开始日期", "结束日期", "招聘企业", "岗位状态", "工种名称", "文化程度", "薪酬", "联系人", "联系电话"}));
             int i = 0;
-            List<List<Object>> rowDatas = new ArrayList();
+            List<List<Object>> rowsData = new ArrayList();
             for (PostVo item : result.getList()) {
                 List<Object> row = new ArrayList();
                 ++i;
@@ -127,7 +129,7 @@ public class PostController {
                 row.add(item.postName);
                 row.add(item.recruitCount);
                 row.add(dateUtils.dateToStr(item.startTime));
-                row.add(item.endTime);
+                row.add(dateUtils.dateToStr(item.endTime));
                 row.add(item.companyName);
                 row.add(item.recordStatus == 1 ? "启用" : "停用");
                 row.add("");
@@ -135,9 +137,9 @@ public class PostController {
                 row.add(item.minSalary+"-"+item.maxSalary);
                 row.add(item.userName);
                 row.add(item.userMobile);
-                rowDatas.add(row);
+                rowsData.add(row);
             }
-            data.setRows(rowDatas);
+            data.setRows(rowsData);
             excelHelper.exportExcel(response, data);
             return null;
         }

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -36,7 +36,7 @@ public class JobHuntController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                    @RequestParam(required = false) String jobHuntID,
+                                    @RequestParam(required = false) List<String> jobHuntIDList,
                                     @RequestParam(required = false) String jobUserID,
                                     @RequestParam(required = false) String jobUserName,
                                     @RequestParam(required = false) String workName,
@@ -48,7 +48,7 @@ public class JobHuntController {
                                     @RequestParam(required = false) BigDecimal maxSalary,
                                     @RequestParam(required = false) Integer isAccomplish) {
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntID,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
         return RespGenerstor.success(result);
     }
 
@@ -86,14 +86,14 @@ public class JobHuntController {
 
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                               @RequestParam(required = false) String jobHuntID, @RequestParam(required = false) String jobUserID,
+                               @RequestParam(required = false) List<String> jobHuntIDList, @RequestParam(required = false) String jobUserID,
                                @RequestParam(required = false) String jobUserName,@RequestParam(required = false) String workName,
                                @RequestParam(required = false) Integer minWorkYear,@RequestParam(required = false) Integer maxWorkYear,
                                @RequestParam(required = false) Integer jobHuntTypeID,@RequestParam(required = false) Integer jobUserTypeID,
                                @RequestParam(required = false) BigDecimal minSalary, @RequestParam(required = false) BigDecimal maxSalary,
                                @RequestParam(required = false) Integer isAccomplish) throws Exception{
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntID,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","姓名","工种名称", "希望工作地区", "可到职日期","工作年限", "求职类型", "人才类型", "月薪要求"}));
         int i = 0;

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -34,10 +34,12 @@ public class JobUserController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                @RequestParam(required = false) String name, @RequestParam(required = false) String siteID, @RequestParam(required = false) String jobStatus, @RequestParam(required = false) Integer sexId,
+                                @RequestParam(required = false) List<String> jobUserIDList,
+                                @RequestParam(required = false) String name, @RequestParam(required = false) String siteID,
+                                @RequestParam(required = false) String jobStatus, @RequestParam(required = false) Integer sexId,
                                 @RequestParam(required = false) Integer educationTypeId, @RequestParam(required = false) Integer emphasisTypeId) {
 
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, null, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId);
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId);
         return RespGenerstor.success(result);
     }
 
@@ -106,11 +108,12 @@ public class JobUserController {
 
     @GetMapping("/export")
     public BaseResponse export(HttpServletResponse response, @RequestParam(required = false) Boolean isExport,
+                               @RequestParam(required = false) List<String> jobUserIDList,
                                @RequestParam("page") int pageIndex, @RequestParam("limit") int pageSize,
                                @RequestParam(required = false) String name, @RequestParam(required = false) String siteId, @RequestParam(required = false) String jobStatus,
                                @RequestParam(required = false) Integer sexId,@RequestParam(required = false) Integer educationTypeId,
                                @RequestParam(required = false) Integer emphasisTypeId) throws Exception {
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, null, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId);
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId);
 
         if(isExport == null || !isExport){
             return RespGenerstor.success(result);

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

@@ -32,13 +32,14 @@ public class DoTaskController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String doTaskID,
+    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                                @RequestParam(required = false) List<String> doTaskIDList,
                                 @RequestParam(required = false) String name, @RequestParam(required = false) String startTime,
                                 @RequestParam(required = false) String endTime, @RequestParam(required = false) String finishStartTime,
                                 @RequestParam(required = false) String finishEndTime, @RequestParam(required = false) String regionCode,
                                 @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId,@RequestParam(required = false)Integer taskStatus)
     {
-        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskID,name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
+        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskIDList,name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
         return RespGenerstor.success(result);
     }
 
@@ -102,13 +103,13 @@ public class DoTaskController {
 
     @GetMapping("/export")
     public BaseResponse export(HttpServletResponse response, @RequestParam(required = false) Boolean isExport,
-                               @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String doTaskID,
+                               @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) List<String> doTaskIDList,
                                @RequestParam(required = false) String name, @RequestParam(required = false) String startTime,
                                @RequestParam(required = false) String endTime, @RequestParam(required = false) String finishStartTime,
                                @RequestParam(required = false) String finishEndTime, @RequestParam(required = false) String regionCode,
                                @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId, @RequestParam(required = false) Integer taskStatus) throws Exception {
 
-        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskID, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
+        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskIDList, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

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

@@ -30,10 +30,10 @@ public class DoWorkController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String primaryKey,
+    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) List<String> doWorkIDList,
                                 @RequestParam(required = false) String userName,@RequestParam(required = false) String workStartDate,  @RequestParam(required = false) String workEndDate,
                                 @RequestParam(required = false) Integer doTypeID, @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode){
-        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,primaryKey, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,doWorkIDList, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
         return RespGenerstor.success(result);
     }
 
@@ -56,10 +56,11 @@ public class DoWorkController {
     }
 
     @GetMapping("export")
-    public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String primaryKey,
+    public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                               @RequestParam(required = false) List<String> doWorkIDList,
                                @RequestParam(required = false) String userName,@RequestParam(required = false) String workStartDate,  @RequestParam(required = false) String workEndDate,
                                @RequestParam(required = false) Integer doTypeID, @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode) throws Exception{
-        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,primaryKey, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,doWorkIDList, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","姓名","工作日期", "日志类型", "工作情况","所属县区","所属街道"}));
         int i = 0;

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface CompanyCQuery {
-    List<CompanyVo> getList(@Param("primaryKey") String primaryKey, @Param("companyName") String companyName,
+    List<CompanyVo> getList(@Param("companyIDList") String companyIDList, @Param("companyName") String companyName,
                             @Param("companyCode") String companyCode, @Param("recordStatus") String recordStatus,
                             @Param("regionCode") String regionCode, @Param("streetCode") String streetCode);
 }

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface InstitutionCQuery {
 
-    List<InstitutionVo> getList(@Param("primaryKey") String primaryKey, @Param("companyName") String companyName,
+    List<InstitutionVo> getList(@Param("institutionIDList") String institutionIDList, @Param("companyName") String companyName,
                                 @Param("companyAddress") String companyAddress, @Param("dutyUserName") String dutyUserName);
 
 }

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

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 public interface JobHuntCQuery {
-    List<JobHuntVo> getJobHuntList(@Param("jobHuntID") String jobHuntID,@Param("jobUserID") String jobUserID,
+    List<JobHuntVo> getJobHuntList(@Param("jobHuntIDList") String jobHuntIDList,@Param("jobUserID") String jobUserID,
                                       @Param("jobUserName") String jobUserName,@Param("workName") String workName,
                                       @Param("minWorkYear")Integer minWorkYear,@Param("maxWorkYear")Integer maxWorkYear,
                                       @Param("jobHuntTypeID")Integer jobHuntTypeID, @Param("jobUserTypeID")Integer jobUserTypeID,

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

@@ -6,5 +6,5 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface JobUserCQuery {
-    List<JobUserVo> selectJobUserList(@Param("jobuserID") String jobuserID,@Param("name") String name, @Param("siteId")String siteId, @Param("jobStatus")String jobStatus, @Param("sexId")Integer sexId, @Param("educationTypeId")Integer educationTypeId, @Param("emphasisTypeId")Integer emphasisTypeId);
+    List<JobUserVo> selectJobUserList(@Param("jobUserIDList") String jobUserIDList,@Param("name") String name, @Param("siteId")String siteId, @Param("jobStatus")String jobStatus, @Param("sexId")Integer sexId, @Param("educationTypeId")Integer educationTypeId, @Param("emphasisTypeId")Integer emphasisTypeId);
 }

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface PostCQuery {
-    List<PostVo> selectPostList(@Param("postID")String postID,@Param("postName") String postName, @Param("minCount")Integer minCount, @Param("maxCount")Integer maxCount,
+    List<PostVo> selectPostList(@Param("postIDList")String postIDList,@Param("postName") String postName, @Param("minCount")Integer minCount, @Param("maxCount")Integer maxCount,
                                 @Param("companyName")String companyName, @Param("RecordStatus") String RecordStatus, @Param("WorkName")String WorkName,@Param("companyID")String companyID);
 
     List<RecommendPostVo> selectRecommendPostList(@Param("jobUserID") String jobUserID);

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface SiteInfoCQuery {
-    List<SiteInfoVo> getList(@Param("primaryKey") String primaryKey, @Param("siteCode") String siteCode,
+    List<SiteInfoVo> getList(@Param("siteIDList") String siteIDList, @Param("siteCode") String siteCode,
                              @Param("siteName") String siteName, @Param("institutionName") String institutionName,
                              @Param("regionCode") String regionCode, @Param("streetCode") String streetCode);
 

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

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

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

@@ -39,9 +39,9 @@ public class InstitutionImpl implements InstitutionService {
 
 
     @Override
-    public PageInfo<InstitutionVo> getList(int pageIndex, int pageSize, String primaryKey, String companyName, String companyAddress, String dutyUserName) {
+    public PageInfo<InstitutionVo> getList(int pageIndex, int pageSize, List<String> institutionIDList, String companyName, String companyAddress, String dutyUserName) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<InstitutionVo> dataList = institutionCQuery.getList(primaryKey,companyName,companyAddress,dutyUserName);
+        List<InstitutionVo> dataList = institutionCQuery.getList(stringUtils.ListToInSql(institutionIDList),companyName,companyAddress,dutyUserName);
         PageInfo<InstitutionVo> result = new PageInfo(dataList);
         return result;
     }

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

@@ -42,9 +42,9 @@ public class SiteInfoImpl implements SiteInfoService {
     private PcSiteInstitutionMapper pcSiteInstitutionMapper;
 
     @Override
-    public PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode) {
+    public PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, List<String> siteIDList, String siteCode, String siteName, String institutionName, String regionCode, String streetCode) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<SiteInfoVo> dataList = siteInfoCQuery.getList(primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        List<SiteInfoVo> dataList = siteInfoCQuery.getList(stringUtils.ListToInSql(siteIDList),siteCode,siteName,institutionName,regionCode,streetCode);
         PageInfo<SiteInfoVo> result = new PageInfo(dataList);
         return result;
     }

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

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

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -50,9 +50,9 @@ public class CompanyServiceImpl implements CompanyService {
     private PcPostMapper pcPostMapper;
 
     @Override
-    public PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, String primaryKey, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode) {
+    public PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize,List<String> companyIDList, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<CompanyVo> dataList = companyCQuery.getList(primaryKey, companyName, companyCode, recordStatus, regionCode, streetCode);
+        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode);
         PageInfo<CompanyVo> result = new PageInfo(dataList);
         return result;
     }

src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -44,9 +44,9 @@ public class PostServiceImpl implements PostService {
     private DictionaryService dictionaryService;
 
     @Override
-    public PageInfo<PostVo> getList(Integer page, Integer rows, String postID, String postName, Integer minCount, Integer maxCount, String companyName, String recordStatus, String WorkName,String companyID) {
+    public PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList, String postName, Integer minCount, Integer maxCount, String companyName, String recordStatus, String WorkName,String companyID) {
         PageHelper.startPage(page, rows);
-        List<PostVo> list = postCQuery.selectPostList(postID, postName, minCount, maxCount, companyName, recordStatus, WorkName,companyID);
+        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), postName, minCount, maxCount, companyName, recordStatus, WorkName,companyID);
         PageInfo<PostVo> result = new PageInfo(list);
         return result;
 

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -39,11 +39,11 @@ public class JobHuntServiceImpl implements JobHuntService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, String jobHuntID,String jobUserID, String jobUserName, String workName,
+    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList,String jobUserID, String jobUserName, String workName,
                                        Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                        BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(jobHuntID,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList),jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
 
         PageInfo<JobHuntVo> result = new PageInfo(list);
 

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -41,10 +41,10 @@ public class JobUserServiceImpl implements JobUserService {
     private PcPostMapper pcPostMapper;
 
     @Override
-    public PageInfo<JobUserVo> getList(Integer page, Integer rows, String jobuserID, String name, String siteId, String jobStatus, Integer sexId, Integer educationTypeId, Integer emphasisTypeId) {
+    public PageInfo<JobUserVo> getList(Integer page, Integer rows, List<String> jobUserIDList, String name, String siteId, String jobStatus, Integer sexId, Integer educationTypeId, Integer emphasisTypeId) {
         PageHelper.startPage(page, rows);
 
-        List<JobUserVo> list = jobUserCQuery.selectJobUserList(jobuserID, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId);
+        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId);
 
         PageInfo<JobUserVo> result = new PageInfo(list);
 

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

@@ -39,10 +39,10 @@ public class DoTaskImpl implements DoTaskService {
     private PcDotaskUserMapper doTaskUserMapper;
 
     @Override
-    public PageInfo<DoTaskVo> getList(Integer page, Integer rows,String doTaskID, String name, String startTime, String endTime, String finishStartTime, String finishEndTime, String regionCode, String streetCode, String workTypeId,Integer taskStatus) {
+    public PageInfo<DoTaskVo> getList(Integer page, Integer rows,List<String> doTaskIDList, String name, String startTime, String endTime, String finishStartTime, String finishEndTime, String regionCode, String streetCode, String workTypeId,Integer taskStatus) {
         try {
             PageHelper.startPage(page, rows);
-            List<DoTaskVo> list = doTaskCQuery.getList(doTaskID, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
+            List<DoTaskVo> list = doTaskCQuery.getList(stringUtils.ListToInSql(doTaskIDList), name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
             PageInfo<DoTaskVo> result = new PageInfo(list);
             return result;
         } catch (Exception e) {
@@ -71,7 +71,7 @@ public class DoTaskImpl implements DoTaskService {
             };
             try {
                 if(curDoTaskIDs.size()>0){
-                    var result = getList(page,rows,stringUtils.ListToInSql(curDoTaskIDs),null,null,null,null,null,null,null,null,null);
+                    var result = getList(page,rows,curDoTaskIDs,null,null,null,null,null,null,null,null,null);
                     return result;
                 }
                 return null;

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

@@ -2,20 +2,15 @@ package com.hz.employmentsite.services.impl.taskAndLog;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.filter.exception.BaseResponse;
-import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.mapper.PcDoworkMapper;
 import com.hz.employmentsite.mapper.cquery.DoWorkCQuery;
 import com.hz.employmentsite.model.PcDowork;
 import com.hz.employmentsite.model.PcDoworkExample;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
 import com.hz.employmentsite.util.StringUtils;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -34,9 +29,9 @@ public class DoWorkImpl implements DoWorkService {
     private PcDoworkMapper pcDoworkMapper;
 
     @Override
-    public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, String primaryKey, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode) {
+    public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode) {
             PageHelper.startPage(pageIndex, pageSize);
-            List<DoWorkVo> list = doWorkCQuery.getList(primaryKey, userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode);
+            List<DoWorkVo> list = doWorkCQuery.getList(stringUtils.ListToInSql(doWorkIDList), userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode);
             PageInfo<DoWorkVo> result = new PageInfo(list);
             return result;
     }

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface InstitutionService {
 
-    PageInfo<InstitutionVo> getList(int pageIndex, int pageSize, String primaryKey, String companyName, String companyAddress, String dutyUserName);
+    PageInfo<InstitutionVo> getList(int pageIndex, int pageSize,List<String> instutitutionIDList, String companyName, String companyAddress, String dutyUserName);
 
     InstitutionVo get(String institutionID);
 

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

@@ -3,13 +3,12 @@ package com.hz.employmentsite.services.service.baseSettings;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
-
 import java.util.List;
 
 
 public interface SiteInfoService {
 
-    PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode);
+    PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, List<String> siteIDList, String siteCode, String siteName, String institutionName, String regionCode, String streetCode);
 
     List<SelectProps> getDataList();
 

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

@@ -1,5 +1,4 @@
 package com.hz.employmentsite.services.service.baseSettings;
-
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
@@ -9,7 +8,7 @@ import java.util.List;
 
 public interface SiteUserService {
 
-    PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, String primaryKey, String userName);
+    PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String userName,String siteID);
 
     PageInfo<SiteUserVo> getListBySiteID(int pageIndex, int pageSize, String siteID);
 

src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface CompanyService {
 
-    PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, String siteName, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode);
+    PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, List<String> companyIDList, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode);
 
     Integer save(CompanyVo data, String userId);
 

src/main/java/com/hz/employmentsite/services/service/companyService/PostService.java

@@ -1,13 +1,11 @@
 package com.hz.employmentsite.services.service.companyService;
-
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.vo.companyService.RecommendPostVo;
 import com.hz.employmentsite.vo.companyService.PostVo;
-
 import java.util.List;
 
 public interface PostService {
-    PageInfo<PostVo> getList(Integer page, Integer rows, String postID,String postName, Integer minCount, Integer maxCount, String companyName,String RecordStatus,String WorkName,String companyID);
+    PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList,String postName, Integer minCount, Integer maxCount, String companyName,String RecordStatus,String WorkName,String companyID);
     PageInfo<RecommendPostVo> getCommendPostList(Integer page, Integer rows, String jobUserID);
     Integer saveCommendPost(RecommendPostVo data, String userId);
     int save(PostVo data, String userId);

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobHuntService.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface JobHuntService {
 
-    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, String jobHuntID,String jobUserID, String jobUserName, String workName,
+    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize,List<String> jobHuntIDList, String jobUserID, String jobUserName, String workName,
                                 Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                 BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish);
 

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobUserService.java

@@ -10,7 +10,7 @@ import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import java.util.List;
 
 public interface JobUserService {
-    PageInfo<JobUserVo> getList(Integer page, Integer rows,String jobuserID, String name, String siteId, String jobStatus,Integer sexId,Integer educationTypeId,Integer emphasisTypeId);
+    PageInfo<JobUserVo> getList(Integer page, Integer rows,List<String> jobUserIDList, String name, String siteId, String jobStatus,Integer sexId,Integer educationTypeId,Integer emphasisTypeId);
 
     JobUserVo getDataById(String id);
 

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

@@ -7,7 +7,7 @@ import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import java.util.List;
 
 public interface DoTaskService {
-    PageInfo<DoTaskVo> getList(Integer page, Integer rows, String doTaskID, String name, String startTime, String endTime, String finishStartTime, String finishEndTime,
+    PageInfo<DoTaskVo> getList(Integer page, Integer rows, List<String> doTaskIDList, String name, String startTime, String endTime, String finishStartTime, String finishEndTime,
                                String regionCode, String streetCode, String workTypeId,Integer taskStatus);
 
     PageInfo<DoTaskVo> getMyTasks(Integer page, Integer rows, String userID);

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

@@ -6,7 +6,7 @@ import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import java.util.List;
 
 public interface DoWorkService {
-    PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, String primaryKey, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode);
+    PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode);
 
     DoWorkVo get(String doWorkID);
 

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

@@ -26,7 +26,7 @@ public class SiteInfoVo {
     public String institutionID;
     public String institutionName;
     public List<SiteUserVo> manageUsers;
-    public Integer userCount;
+    public String siteUsers;
 
     public String createUserID;
     public Date createTime;

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

@@ -9,8 +9,8 @@
         left join area_code city on company.RegionCode = city.code
         left join area_code area on company.StreetCode = area.code
         where 1=1
-        <if test="primaryKey!='' and primaryKey!=null">
-            and companyID = #{primaryKey}
+        <if test="companyIDList!='' and companyIDList!=null">
+            and companyID in (${companyIDList})
         </if>
         <if test="companyName!='' and companyName!=null">
             and companyName like Concat('%',#{companyName},'%')

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

@@ -11,8 +11,8 @@
         left join pc_dotask_user doTaskUser on task.dotaskID = doTaskUser.dotaskID
         left join area_code city on city.`code` = task.RegionCode
         left join area_code area on area.`code` = task.StreetCode  where item.DictionaryCode='TaskType'
-        <if test="doTaskID != '' and doTaskID != null">
-            and task.dotaskID in (${doTaskID})
+        <if test="doTaskIDList != '' and doTaskIDList != null">
+            and task.dotaskID in (${doTaskIDList})
         </if>
         <if test="name != '' and name != null">
             and task.dotaskName like Concat('%',#{name},'%')

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

@@ -8,8 +8,8 @@
         left join area_code street on workLog.StreetCode = street.code
         left join pc_site_user siteUser on workLog.SiteUserID = siteUser.SiteUserID
         where 1=1
-        <if test="primaryKey!='' and primaryKey!=null">
-            and doworkID in (${primaryKey})
+        <if test="doWorkIDList!='' and doWorkIDList!=null">
+            and doworkID in (${doWorkIDList})
         </if>
         <if test="userName!='' and userName!=null">
             and siteUser.Name like Concat('%',#{userName},'%')

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

@@ -5,8 +5,8 @@
         select institution.*,COUNT(inSites.siteInstitutionID)as siteCount from  pc_institution  institution
         left join pc_site_institution inSites on institution.institutionID = inSites.institutionID
         where 1 = 1
-        <if test="primaryKey!='' and primaryKey!=null">
-            and institution.institutionID in (${primaryKey})
+        <if test="institutionIDList!='' and institutionIDList!=null">
+            and institution.institutionID in (${institutionIDList})
         </if>
         <if test="companyName!='' and companyName!=null">
             and companyName like Concat('%',#{companyName},'%')

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

@@ -8,8 +8,8 @@
         left join (select * from sys_dictionary_item where DictionaryCode ='JobUserType') dic_jobUserType on jobHunt.JobUserType = dic_jobUserType.value
         left join (select * from sys_dictionary_item where DictionaryCode ='JobHuntType') dic_huntJobType on jobHunt.JobHuntType = dic_huntJobType.value
         where 1=1
-        <if test="jobHuntID != '' and jobHuntID != null">
-            and jobHuntId in (${jobHuntID})
+        <if test="jobHuntIDList != '' and jobHuntIDList != null">
+            and jobHuntId in (${jobHuntIDList})
         </if>
         <if test="jobUserID != '' and jobUserID != null">
             and jobHunt.jobUserId = #{jobUserID}

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

@@ -10,8 +10,8 @@
         left join sys_dictionary_item jobstatus on jobuser.JobStatusID = jobstatus.value and jobstatus.DictionaryCode='JobStatus'
         left join sys_dictionary_item keytype on jobuser.KeyPersonTypeID = keytype.value and keytype.DictionaryCode='KeyPersonType'
         where 1=1
-        <if test="jobuserID != '' and jobuserID != null">
-            and jobuser.jobuserID = #{jobuserID}
+        <if test="jobUserIDList != '' and jobUserIDList != null">
+            and jobuser.jobuserID in (${jobUserIDList})
         </if>
         <if test="name != '' and name != null">
             and jobuser.name like Concat('%',#{name},'%')

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

@@ -8,8 +8,8 @@
         left join sys_dictionary_item item
         on item.value=post.CultureRank and item.DictionaryCode='CultureLevel'
         where 1=1
-        <if test="postID != '' and postID != null">
-            and post.postID in (${postID})
+        <if test="postIDList != '' and postIDList != null">
+            and post.postID in (${postIDList})
         </if>
         <if test="postName != '' and postName != null">
             and post.postName like Concat('%',#{postName},'%')

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

@@ -3,15 +3,15 @@
 <mapper namespace="com.hz.employmentsite.mapper.cquery.SiteInfoCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
         select site.*,inSites.InstitutionID as InstitutionID,inSites.SiteInstitutionID,institution.companyName as InstitutionName,
-        COUNT(siteUser.SiteUserID)as userCount,region.name as RegionName,street.name as StreetName from pc_site site
+        (select GROUP_CONCAT(SiteUserName SEPARATOR ',')  from pc_site_user siteUser where SiteID = site.siteID ) AS siteUsers,
+        region.name as RegionName,street.name as StreetName from pc_site site
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
-        left join pc_site_user siteUser on site.SiteID = siteUser.SiteID
         left join area_code region on site.RegionCode = region.code
         left join area_code street on site.StreetCode = street.code
         where 1=1
-        <if test="primaryKey!='' and primaryKey!=null">
-            and site.siteID in (${primaryKey})
+        <if test="siteIDList!='' and siteIDList!=null">
+            and site.siteID in (${siteIDList})
         </if>
         <if test="siteCode!='' and siteCode!=null">
             and siteCode like Concat('%',#{siteCode},'%')

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

@@ -7,13 +7,15 @@
         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">
-            and siteUserID in (${primaryKey})
+        <if test="siteUserIDList!='' and siteUserIDList!=null">
+            and siteUserID in (${siteUserIDList})
         </if>
         <if test="userName!='' and userName!=null">
             and siteUser.name like Concat('%',#{userName},'%')
         </if>
-
+        <if test="siteID!='' and siteID!=null">
+            and siteUser.siteID = #{siteID}
+        </if>
     </select>
 
     <select id="getListBySiteID" resultType="com.hz.employmentsite.vo.baseSettings.SiteUserVo">

vue/src/views/baseSettings/institution/index.vue

@@ -34,7 +34,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01010102" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'"   :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
+          <BExportExcel :title="'导出'"   :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000,institutionIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -77,7 +77,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey:'',
       companyName: '',
       companyAddress: '',
       dutyUserName:''

vue/src/views/baseSettings/siteInfo/edit.vue

@@ -68,7 +68,7 @@
             <a-button type="primary"  @click='' >选择</a-button>
         </a-col>
       </a-row>
-      <a-divider orientation="left">管理人员 共计：{{manageUsers.length}}</a-divider>
+<!--      <a-divider orientation="left">管理人员 共计：{{manageUsers.length}}</a-divider>
       <a-row>
         <a-col :span="24" style="text-align: right; margin-top: 20px; margin-right: 20px">
           <Space>
@@ -113,7 +113,7 @@
             </template>
           </a-table>
         </a-col>
-      </a-row>
+      </a-row>-->
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
         <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remark"  :disabled="opCategory==3"

vue/src/views/baseSettings/siteInfo/index.vue

@@ -13,8 +13,14 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属机构" :label-col="{span:8}" name="institutionName">
-            <a-input v-model:value="searchParams.institutionName" placeholder=""/>
+          <a-form-item label="所属机构" :label-col="{span:8}" name="institutionID">
+            <a-select
+              ref="select"
+              v-model:value="searchParams.institutionID"
+              :options="allInstitutions"
+              @change="loadData"
+              :field-names="{ label: 'text', value: 'value' }"  >
+            </a-select>
           </a-form-item>
         </a-col>
       <a-col :span="6" style="text-align: left">
@@ -73,7 +79,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit"  functioncode="T01010202" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000,siteIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -107,6 +113,7 @@ import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
 import {message, Modal, SelectProps} from "ant-design-vue";
+import {getInstitutionDataList} from "@/api/baseSettings/institution";
 
 export default defineComponent({
   name: 'SiteList',
@@ -118,7 +125,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey:'',
       siteCode: '',
       siteName: '',
       institutionName:'',
@@ -140,7 +146,7 @@ export default defineComponent({
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center"},
       {title: '详细地址', dataIndex: 'detailAddress', key: 'detailAddress', align: "center"},
       {title: '所属机构', dataIndex: 'institutionName', key: 'institutionName', align: "center"},
-      {title: '驿站人员数量',  dataIndex: 'userCount',key: 'userCount', fixed: 'right',width:170, align: "center"},
+      {title: '驿站人员',  dataIndex: 'siteUsers',key: 'siteUsers', fixed: 'right',width:170, align: "center"},
       {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},
     ];
     const pagination = computed(() => ({
@@ -151,6 +157,7 @@ export default defineComponent({
       showTotal: total => getPaginationTotalTitle(total)
     }));
 
+    const allInstitutions = ref<any>([]);
     const regionList = ref<SelectProps['options']>();
     const streetList = ref<SelectProps['options']>();
     const dataList = ref([]);
@@ -161,6 +168,12 @@ export default defineComponent({
       loadData();
     };
 
+    const getAllInstitutions = async function(){
+      const reqData: any = await getInstitutionDataList();
+      allInstitutions.value = reqData;
+      console.log('allInstitutions',allInstitutions.value);
+    }
+
     const getRegionList = async function(){
       const regionResult: any = await getRegionCodeList();
       console.log('regionResult',regionResult);
@@ -223,6 +236,8 @@ export default defineComponent({
 
     const loadData = async function () {
       formState.loading = true;
+      await getAllInstitutions();
+      await getRegionList();
       const result: any = await getSiteList(searchParams);
       dataList.value = result.list;
       formState.total = result.total;
@@ -236,6 +251,7 @@ export default defineComponent({
       formState,
       columns,
       pagination,
+      allInstitutions,
       streetList,
       regionList,
       dataList,
@@ -246,17 +262,14 @@ export default defineComponent({
       onEdit,
       onDel,
       loadData,
-      getRegionList,
       changeRegion
     };
   },
   created() {
-    this.getRegionList();
     this.loadData();
   },
   activated() {
     if (history.state.params?.reload)
-      this.getRegionList();
       this.loadData();
   }
 });

vue/src/views/baseSettings/siteUser/edit.vue

@@ -25,14 +25,21 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="用户类型"  name="roleID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择人员角色!' }]">
+          <a-form-item label="用户类型"  name="roleID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择用户类型!' }]">
             <label v-if="opCategory==3">{{dataModel.roleID }}</label>
             <a-select ref="select" v-model:value="dataModel.roleID" :options="roleList"
                       :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-
+          <a-form-item label="所属驿站"  name="siteID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属驿站!' }]">
+            <a-select
+              ref="select"
+              v-model:value="dataModel.siteID"
+              :options="allSites"
+              :field-names="{ label: 'siteName', value: 'siteID' }" >
+            </a-select>
+          </a-form-item>
         </a-col>
         <a-col :span="7">
 
@@ -53,6 +60,7 @@ import BUploadFile from "@/components/file/uploadFile.vue";
 import type {SelectProps} from "ant-design-vue";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import {message} from "ant-design-vue";
+import {getSiteList} from "@/api/baseSettings/siteInfo";
 
 interface InstitutionModel {
   dataModel: any;
@@ -78,24 +86,30 @@ export default defineComponent({
       selectedRowKeys: [],
       loading: false
     });
+    const allSites = ref<any>([]);
     const genderList =  ref<SelectProps["options"]>();
     const roleList =  ref<SelectProps["options"]>([]);
+
+    const getAllSites = () => {
+      getSiteList({pageIndex:1,pageSize:9999}).then((result :any) => {
+        allSites.value = result.list;
+      })
+    }
     const getGenderList = async function(){
       const genderResult :any = await getSysDictionaryList("Gender");
       genderList.value = genderResult;
     }
-    const getRoleList = async function(){
+    const getRoleList = async function(operateType:number){
       const roleResult :any = await getSysDictionaryList("UserType");
-      roleList.value = roleResult;
+      roleList.value = operateType==1?[{name:"驿站工作者",value:3}]:roleResult;
+      console.log("roleList",roleList.value);
     }
 
-    const loadData = (siteUserID: string/*,operateType:number*/) => {
+    const loadData = (siteUserID: string,operateType:number) => {
+      getAllSites();
       getGenderList();
-      getRoleList();
-      /*if(operateType == 1){
-        roleList.value = [{value:3,name:'驿站工作者'}];
-      }
-      opCategory.value = operateType;*/
+      getRoleList(operateType);
+      opCategory.value = operateType;
       getSiteUserByID(siteUserID).then((result: any) => {
         formData.dataModel = result;
         console.log("dataModel",formData.dataModel);
@@ -137,6 +151,7 @@ export default defineComponent({
       formState,
       opCategory,
       isAllowCommit,
+      allSites,
       genderList,
       roleList,
       onSelectChange,
@@ -144,9 +159,8 @@ export default defineComponent({
   },
   created() {
     const id = history.state.params?.id;
-    this.loadData(id);
-   /* const op = history.state.params?.op;*/
-   /* this.loadData(id,op);*/
+    const op = history.state.params?.op;
+    this.loadData(id,op);
   },
 })
 </script>

vue/src/views/baseSettings/siteUser/index.vue

@@ -37,7 +37,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01010302" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'/userInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'/userInfo/export'" :params="{...searchParams, rows:100000,siteUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -83,7 +83,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey:'',
       siteUserName: '',
       siteID:''
     });

vue/src/views/companyService/company/index.vue

@@ -87,7 +87,7 @@
           ></BImportExcel>
           <BExportExcel :title="'导出'" :filename="'企业信息'"
                         :url="'companyService/company/export'"
-                        :params="{...searchParams, isExport: true, rows:10000}"></BExportExcel>
+                        :params="{...searchParams, isExport: true, rows:10000,companyIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -133,7 +133,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey: '',
       companyName: '',
       companyCode: '',
       recordStatus: '',

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

@@ -110,21 +110,21 @@
           <a-col flex="300px" style="margin-left: 3px;">
             <a-form-item
               label="岗位月薪(元)"
-              name="maxSalary"
+              name="minSalary"
               :label-col="{span:9}"
               :rules="[{ required: false, message: '请输入金额!' }]"
             >
-              <a-input v-model:value="item.maxSalary" placeholder="请输入金额"/>
+              <a-input v-model:value="item.minSalary" placeholder="请输入金额"/>
             </a-form-item>
           </a-col>
           &nbsp; 至 &nbsp;
           <a-col flex="200px">
             <a-form-item
               :label-col="{ span: 6 }"
-              name="minSalary"
+              name="maxSalary"
               :rules="[{ required: false, message: '请输入金额' }]"
             >
-              <a-input v-model:value="item.minSalary" placeholder="请输入金额"/>
+              <a-input v-model:value="item.maxSalary" placeholder="请输入金额"/>
             </a-form-item>
           </a-col>
           <a-col flex="400px">

vue/src/views/companyService/post/index.vue

@@ -81,7 +81,7 @@
           ></BImportExcel>
           <BExportExcel :title="'导出'" :filename="'岗位信息'"
                         :url="'companyService/post/export'"
-                        :params="{...searchParams, isExport: true, rows:10000}"></BExportExcel>
+                        :params="{...searchParams, isExport: true, rows:10000,postIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -129,7 +129,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey: '',
       minCount: null,
       maxCount: null,
       recordStatus: null
@@ -198,11 +197,11 @@ export default defineComponent({
           return item.record.recordStatus == 1 ? "启用" : "停用";
         }
       },
-      {title: '工种名称', dataIndex: 'workNmae', key: 'workNmae', align: "center"},
+      {title: '工种名称', dataIndex: 'workName', key: 'workName', align: "center"},
       {title: '文化程度', dataIndex: 'cultureLevelName', key: 'cultureLevelName', align: "center"},
       {
         title: '薪酬', dataIndex: 'siteCount', key: 'siteCount', align: "center", customRender: (item) => {
-          const salary = `${item.record.minSalary ?? ""}~${item.record.maxSalary ?? ""}`
+          const salary = `${item.record.minSalary ?? ""}-${item.record.maxSalary ?? ""}`
           return salary;
         }
       },

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -102,7 +102,7 @@
             :options="importOptions"
             @success="loadData"
           ></BImportExcel>
-          <BExportExcel :title="'导出'" :filename="'求职意向信息'" :url="'/jobUserService/jobHunt/export'" :params="{...searchParamsState, rows:100000}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'求职意向信息'" :url="'/jobUserService/jobHunt/export'" :params="{...searchParamsState, rows:100000,jobHuntIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -147,7 +147,6 @@ import {useTabsViewStore} from "@/store/modules/tabsView";
       const searchParamsState = reactive({
         pageIndex: 1,
         pageSize: 20,
-        jobHuntID:null,
         jobUserName: null,
         workName:null,
         minWorkYear: null,

vue/src/views/jobUserManager/jobuser/index.vue

@@ -105,7 +105,7 @@
           <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01030102">新增</a-button>
           <BExportExcel :title="'导出'" :filename="'求职人员信息'"
                         :url="'Jobusermgr/Jobuser/export'"
-                        :params="{...searchParamsState, isExport: true, rows:10000}"></BExportExcel>
+                        :params="{...searchParamsState, isExport: true, rows:10000,siteUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

vue/src/views/taskAndLog/dotask/index.vue

@@ -84,7 +84,7 @@
           <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01040102">新增</a-button>
           <BExportExcel :title="'导出'" :filename="'任务信息'"
                         :url="'taskAndLog/dotask/export'"
-                        :params="{...searchParams, isExport: true, rows:10000}"></BExportExcel>
+                        :params="{...searchParams, isExport: true, rows:10000,doTaskIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -129,7 +129,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey: '',
       recordStatus:1,
       startTime:'',
       endTime:'',

vue/src/views/taskAndLog/dowork/index.vue

@@ -72,7 +72,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01040202" @click='onAdd'>新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'/doWork/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'/doWork/export'" :params="{...searchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -119,7 +119,6 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
-      primaryKey: '',
       userName:'',
       workStartDate:null,
       workEndDate:null,
@@ -177,7 +176,7 @@ export default defineComponent({
     }
 
     const changeRegion = async function(){
-      if(searchParams.regionCode){ 
+      if(searchParams.regionCode){
         const streetResult: any = await getStreetCodeList(searchParams.regionCode);
         console.log('streetResult',streetResult);
         streetList.value = streetResult;