web-bug修改2

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

@@ -34,10 +34,10 @@ public class SiteInfoController {
     @GetMapping("/getList")
     public BaseResponse<PageInfo<SiteInfoVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                                       @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 siteName, @RequestParam(required = false) String institutionID,
                                                       @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
 
-        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,siteIDList,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,siteIDList,siteCode,siteName,institutionID,regionCode,streetCode);
 
         return RespGenerstor.success(result);
     }
@@ -74,10 +74,10 @@ public class SiteInfoController {
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                @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 siteName, @RequestParam(required = false) String institutionID,
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) throws Exception{
 
-        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,siteIDList,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,siteIDList,siteCode,siteName,institutionID,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

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.companyService.CompanyVo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface CompanyCQuery {

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface SiteInfoCQuery {
     List<SiteInfoVo> getList(@Param("siteIDList") String siteIDList, @Param("siteCode") String siteCode,
-                             @Param("siteName") String siteName, @Param("institutionName") String institutionName,
+                             @Param("siteName") String siteName, @Param("institutionID") String institutionID,
                              @Param("regionCode") String regionCode, @Param("streetCode") String streetCode);
 
     List<SiteInfoVo> getListByInstitutionID(@Param("institutionID") String institutionID);

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, List<String> siteIDList, 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 institutionID, String regionCode, String streetCode) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<SiteInfoVo> dataList = siteInfoCQuery.getList(stringUtils.ListToInSql(siteIDList),siteCode,siteName,institutionName,regionCode,streetCode);
+        List<SiteInfoVo> dataList = siteInfoCQuery.getList(stringUtils.ListToInSql(siteIDList),siteCode,siteName,institutionID,regionCode,streetCode);
         PageInfo<SiteInfoVo> result = new PageInfo(dataList);
         return result;
     }

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

@@ -135,10 +135,13 @@ public class CompanyServiceImpl implements CompanyService {
 
     @Override
     public CompanyVo getDataById(String id) {
+        List<String> ids = new ArrayList<>();
         if (stringUtils.IsNullOrEmpty(id)) {
             return null;
+        }else{
+            ids.add(id);
         }
-        return  companyCQuery.getList(id, null, null, null, null, null).stream().findFirst().orElse(null);
+        return  companyCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null).stream().findFirst().orElse(null);
     }
 
     @Override

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

@@ -19,8 +19,8 @@
         <if test="siteName!='' and siteName!=null">
             and siteName like Concat('%',#{siteName},'%')
         </if>
-        <if test="institutionName!='' and institutionName!=null">
-            and institution.companyName  like Concat('%',#{institutionName},'%')
+        <if test="institutionID!='' and institutionID!=null">
+            and inSites.institutionID = #{institutionID}
         </if>
         <if test="regionCode!='' and regionCode!=null">
             and regionCode like Concat('%',#{regionCode},'%')

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

@@ -19,7 +19,8 @@
               v-model:value="searchParams.institutionID"
               :options="allInstitutions"
               @change="loadData"
-              :field-names="{ label: 'text', value: 'value' }"  >
+              :field-names="{ label: 'text', value: 'value' }"
+              :allow-clear="true" >
             </a-select>
           </a-form-item>
         </a-col>
@@ -127,7 +128,7 @@ export default defineComponent({
       pageSize: 20,
       siteCode: '',
       siteName: '',
-      institutionName:'',
+      institutionID:'',
       regionCode:'',
       streetCode:'',
     });

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

@@ -3,18 +3,20 @@
     <a-form ref="formRef" name="advanced_search"  class="ant-advanced-search-form" :model="searchParams" >
       <a-row :gutter="24">
         <a-col :span="6">
-          <a-form-item label="人员名称" :label-col="{span:8}" name="userName">
+          <a-form-item label="人员名称" :label-col="{span:8}" name="siteUserName">
             <a-input v-model:value="searchParams.siteUserName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属驿站" :label-col="{span:8}" name="userName">
+          <a-form-item label="所属驿站" :label-col="{span:8}" name="siteID">
             <a-select
               ref="select"
               v-model:value="searchParams.siteID"
               :options="allSites"
               @change="loadData"
-              :field-names="{ label: 'siteName', value: 'siteID' }" style="width: 200px" >
+              :field-names="{ label: 'siteName', value: 'siteID' }"
+              :allow-clear="true"
+              style="width: 200px" >
             </a-select>
           </a-form-item>
         </a-col>

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

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

vue/src/views/taskAndLog/dowork/edit.vue

@@ -44,8 +44,7 @@
         </a-col>
       </a-row>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.workContent"  :disabled="opCategory==3"
-                    placeholder="完成情况" style="text-align: center;" />
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.workContent"  :disabled="opCategory==3" placeholder="完成情况" />
       </a-row>
       <a-divider orientation="left">其他</a-divider>
       <b-upload-file :fileRefId="dataModel.doWorkID" :readonly="false" :multiple="true"