bug处理

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

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

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

@@ -55,7 +55,7 @@ public class JobHuntController {
         var data = jobhuntService.get(jobHuntID);
         if (data == null) {
             data = new JobHuntVo();
-            data.jobHuntID  = UUID.randomUUID().toString();
+            data.jobHuntID = UUID.randomUUID().toString();
         }
         return RespGenerstor.success(data);
     }

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

@@ -6,7 +6,6 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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("siteUserIDList") String siteUserIDList, @Param("userName") String userName,@Param("siteID") String siteID);
+    List<SiteUserVo> getList(@Param("siteUserIDList") String siteUserIDList, @Param("siteUserName") String siteUserName,@Param("siteID") String siteID);
 
     List<SiteUserVo> getListBySiteID(@Param("siteID") String siteID);
 }

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, List<String> siteUserIDList, String userName,String siteID) {
+    public PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName,String siteID) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<SiteUserVo> dataList = userInfoCQuery.getList(stringUtils.ListToInSql(siteUserIDList),userName,siteID);
+        List<SiteUserVo> dataList = userInfoCQuery.getList(stringUtils.ListToInSql(siteUserIDList),siteUserName,siteID);
         PageInfo<SiteUserVo> result = new PageInfo(dataList);
         return result;
     }

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 userName,String siteID);
+    PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName,String siteID);
 
     PageInfo<SiteUserVo> getListBySiteID(int pageIndex, int pageSize, String siteID);
 

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

@@ -10,8 +10,8 @@
         <if test="siteUserIDList!='' and siteUserIDList!=null">
             and siteUserID in (${siteUserIDList})
         </if>
-        <if test="userName!='' and userName!=null">
-            and siteUser.name like Concat('%',#{userName},'%')
+        <if test="siteUserName!='' and siteUserName!=null">
+            and siteUser.siteUserName like Concat('%',#{siteUserName},'%')
         </if>
         <if test="siteID!='' and siteID!=null">
             and siteUser.siteID = #{siteID}

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

@@ -62,7 +62,7 @@ import {getSysDictionaryList} from "@/api/system/dictionary";
 import {message} from "ant-design-vue";
 import {getSiteList} from "@/api/baseSettings/siteInfo";
 
-interface InstitutionModel {
+interface siteUserModel {
   dataModel: any;
 }
 
@@ -79,7 +79,7 @@ export default defineComponent({
     const title = ref();
     const opCategory = ref<any>();
     const tabsViewStore = useTabsViewStore();
-    const formData = reactive<InstitutionModel>({ dataModel:{}});
+    const formData = reactive<siteUserModel>({ dataModel:{}});
     const isAllowCommit = ref<boolean>(true) ;
     const formState = reactive({
       total: 0,

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

@@ -40,8 +40,8 @@
         </Space>
       </a-col>
     </a-row>
-    <!--      <a-divider orientation="left">岗位管理</a-divider>-->
-    <div v-for="(item,index) in postDataList" style="border: 1px solid;margin-bottom: 20px;" :key="index">
+    <!--<a-divider orientation="left">岗位管理</a-divider>-->
+    <div v-for="(item,index) in postDataList" style="margin-bottom: 20px;background-color: #f0f0f0" :key="index">
       <h1>基础信息</h1>
       <a-form :model="item" autocomplete="off">
         <a-row :gutter="24">
@@ -186,7 +186,7 @@
               <a-select
                 ref="select"
                 v-model:value="item.workYear"
-                :options="WorkYearTypelList"
+                :options="WorkYearTypeList"
                 :field-names="{ label: 'name', value: 'value' }"
               >
               </a-select>
@@ -224,7 +224,7 @@
           </a-col>
         </a-row>
         <a-row v-if="!isEdit">
-          <a-col style="text-align: right;" span="23">
+          <a-col style="text-align: right;" :span="23">
             <a-button type="danger" @click="delPostItem(index)">删除</a-button>
           </a-col>
         </a-row>
@@ -285,7 +285,7 @@ export default defineComponent(
       const isEdit = ref(false);
 
       const cultureLevelList = ref<SelectProps['options']>();
-      const WorkYearTypelList = ref<SelectProps['options']>();
+      const WorkYearTypeList = ref<SelectProps['options']>();
       const companyList = ref<SelectProps['options']>();
       const postStatusList = [{name: '启用', value: 1}, {name: '停用', value: 0}];
       const trialStatusList = [{name: '是', value: true}, {name: '否', value: false}];
@@ -320,7 +320,7 @@ export default defineComponent(
       });
 
       get('system/dictionary/getDictionaryItemByCodeList', {code: 'WorkYearType'}).then(result => {
-        WorkYearTypelList.value = result;
+        WorkYearTypeList.value = result;
       });
 
       get('companyService/company/getList', {pageIndex: 1, pageSize: 999}).then(result => {
@@ -389,7 +389,7 @@ export default defineComponent(
         cultureLevelList,
         postDataList,
         addPost,
-        WorkYearTypelList,
+        WorkYearTypeList,
         delPostItem,
         postCompany,
         isEdit

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -7,7 +7,7 @@
           <a-form-item label="姓名"  name="jobUserID" :label-col="{span:8}"  :rules="[{ required: true, message: '请输选择求职人员!' }]">
             <label v-if="opCategory==3">{{dataModel.name}}</label>
             <a-select  ref="select"  v-model:value="dataModel.jobUserID" :options="jobUserList"
-                       :field-names="{label:'text',value:'value'}"  @change="loadData"  :allow-clear="true"  >
+                       :field-names="{label:'text',value:'value'}"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
@@ -21,7 +21,7 @@
           <a-form-item label="求职类型" name="jobHuntType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择求职类型!' }]">
             <label v-if="opCategory==3">{{dataModel.jobHuntType}}</label>
             <a-select  ref="select"  v-model:value="dataModel.jobHuntType" :options="jobHuntTypeList"
-                       :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
+                       :field-names="{label:'name',value:'value'}"   :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
@@ -31,7 +31,7 @@
           <a-form-item label="人才类型"  name="jobUserType" :label-col="{span:8}" :rules="[{ required: true, message: '请选择人才类型!' }]">
             <label v-if="opCategory==3">{{dataModel.jobUserType }}</label>
             <a-select  ref="select"  v-model:value="dataModel.jobUserType" :options="jobUserTypeList"
-                       :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
+                       :field-names="{label:'name',value:'value'}"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
@@ -47,7 +47,7 @@
           <a-form-item label="求职岗位"  name="postID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择求职岗位!' }]">
             <label v-if="opCategory==3">{{dataModel.postID}}</label>
             <a-select  ref="select"  v-model:value="dataModel.postID" :options="allPostList"
-                       :field-names="{label:'postName',value:'postID'}"  @change="loadData"  :allow-clear="true"  >
+                       :field-names="{label:'postName',value:'postID'}"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
@@ -74,8 +74,8 @@
       </a-row>
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.otherInfo" :disabled="opCategory==3"
-                    placeholder="其他要求" style="text-align: center;" />
+        <a-textarea name="otherMsg" :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.otherMsg" :disabled="opCategory==3"
+                    placeholder="其他要求"  />
       </a-row>
       <a-form-item class="buttom-btns">
         <a-button @click="onClose">取消</a-button>
@@ -94,8 +94,24 @@ import {getSysDictionaryList} from '@/api/system/dictionary';
 import BUploadFile from "@/components/file/uploadFile.vue";
 import {message,SelectProps} from "ant-design-vue";
 
-interface InstitutionModel {
+interface jobHuntModel {
   dataModel: any;
+    /*{
+    jobHuntID:string|null,
+    jobHuntType:number|null,
+    jobUserID:string|null,
+    jobUserName:string|null,
+    jobUserType:number|null,
+    minSalary:number|null,
+    maxSalary:string|null,
+    postID:string|null,
+    workName:string|null,
+    workCode:string|null,
+    workYear:string|null,
+    areaWork:string|null,
+    inDate:string|null,
+    isAccomplish:string|null
+  };*/
 }
 export default defineComponent({
   name:'JobHuntEditForm',
@@ -111,7 +127,7 @@ export default defineComponent({
     const opCategory = ref<any>();
     const tabsViewStore = useTabsViewStore();
     const isAllowCommit = ref<boolean>(true);
-    const formData = reactive<InstitutionModel>({ dataModel:{}});
+    const formData = reactive<jobHuntModel>({dataModel:{}});
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],

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

@@ -83,7 +83,7 @@
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01040102">新增</a-button>
           <BExportExcel :title="'导出'" :filename="'任务信息'"
-                        :url="'taskAndLog/dotask/export'"
+                        :url="'/taskAndLog/doTask/export'"
                         :params="{...searchParams, isExport: true, rows:10000,doTaskIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>