web-bug调整1

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

@@ -117,23 +117,22 @@ public class PostController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             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();
             for (PostVo item : result.getList()) {
                 List<Object> row = new ArrayList();
-                String recordName = item.recordStatus == 1 ? "启用" : "停用";
                 ++i;
                 row.add(i);
                 row.add(item.postName);
                 row.add(item.recruitCount);
-                row.add(dateUtils.dateToStr(item.createTime));
-                row.add(item.validDay);
+                row.add(dateUtils.dateToStr(item.startTime));
+                row.add(item.endTime);
                 row.add(item.companyName);
-                row.add(recordName);
+                row.add(item.recordStatus == 1 ? "启用" : "停用");
                 row.add("");
                 row.add(item.cultureLevelName);
-                row.add(item.minSalary+"~"+item.maxSalary);
+                row.add(item.minSalary+"-"+item.maxSalary);
                 row.add(item.userName);
                 row.add(item.userMobile);
                 rowDatas.add(row);

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

@@ -221,10 +221,10 @@ public class PostServiceImpl implements PostService {
             String errorInfo = "";
             if (stringUtils.IsNullOrEmpty(item.postName))
                 errorInfo += "请填写岗位名称!";
-            if (stringUtils.IsNullOrEmpty(String.valueOf(item.validTime)) || item.validTime == null)
-                errorInfo += "请填写有效开始时间!";
-            if (stringUtils.IsNullOrEmpty(String.valueOf(item.validDay)) || item.validDay == 0)
-                errorInfo += "请填写有效期(天)!";
+            if (stringUtils.IsNullOrEmpty(String.valueOf(item.startTime)) || item.startTime == null)
+                errorInfo += "请填写开始日期!";
+            if (stringUtils.IsNullOrEmpty(String.valueOf(item.startTime)) || item.startTime == null)
+                errorInfo += "请填写结束日期!";
             if (stringUtils.IsNullOrEmpty(item.recordStatusName))
                 errorInfo += "请填写岗位状态!";
             else {

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

@@ -8,6 +8,7 @@ public class SiteUserVo {
 
     public String siteUserID;
     public String siteID;
+    public String siteName;
     public String siteUserName;
     public String userID;
     public Integer gender;

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

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.cquery.UserInfoCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.SiteUserVo">
-        select siteUser.*,dic_userRole.Name as RoleName,dic_gender.Name as GenderName  from pc_site_user siteUser
+        select siteUser.*,dic_userRole.Name as RoleName,dic_gender.Name as GenderName,site.SiteName from pc_site_user siteUser
+        left join pc_site site on siteUser.siteID = site.siteID
         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

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

@@ -57,6 +57,7 @@ import {message} from "ant-design-vue";
 interface InstitutionModel {
   dataModel: any;
 }
+
 export default defineComponent({
   name:'UserInfoEditForm',
   components: {BUploadFile},
@@ -78,7 +79,7 @@ export default defineComponent({
       loading: false
     });
     const genderList =  ref<SelectProps["options"]>();
-    const roleList =  ref<SelectProps["options"]>();
+    const roleList =  ref<SelectProps["options"]>([]);
     const getGenderList = async function(){
       const genderResult :any = await getSysDictionaryList("Gender");
       genderList.value = genderResult;
@@ -88,9 +89,13 @@ export default defineComponent({
       roleList.value = roleResult;
     }
 
-    const loadData = (siteUserID: string) => {
+    const loadData = (siteUserID: string/*,operateType:number*/) => {
       getGenderList();
       getRoleList();
+      /*if(operateType == 1){
+        roleList.value = [{value:3,name:'驿站工作者'}];
+      }
+      opCategory.value = operateType;*/
       getSiteUserByID(siteUserID).then((result: any) => {
         formData.dataModel = result;
         console.log("dataModel",formData.dataModel);
@@ -140,6 +145,8 @@ export default defineComponent({
   created() {
     const id = history.state.params?.id;
     this.loadData(id);
+   /* const op = history.state.params?.op;*/
+   /* this.loadData(id,op);*/
   },
 })
 </script>

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

@@ -4,11 +4,19 @@
       <a-row :gutter="24">
         <a-col :span="6">
           <a-form-item label="人员名称" :label-col="{span:8}" name="userName">
-            <a-input v-model:value="searchParams.userName" placeholder=""/>
+            <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-select
+              ref="select"
+              v-model:value="searchParams.siteID"
+              :options="allSites"
+              @change="loadData"
+              :field-names="{ label: 'siteName', value: 'siteID' }" style="width: 200px" >
+            </a-select>
+          </a-form-item>
         </a-col>
         <a-col :span="6">
 
@@ -63,6 +71,7 @@ import {getSiteUserList,delSiteUser} from '@/api/baseSettings/userInfo';
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
 import {message, Modal} from "ant-design-vue";
+import {getSiteList} from "@/api/baseSettings/siteInfo";
 
 export default defineComponent({
   name: 'UserInfoList',
@@ -70,11 +79,13 @@ export default defineComponent({
   setup() {
     const formRef = ref<FormInstance>();
     const tabsViewStore = useTabsViewStore();
+    const allSites = ref<any>([]);
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
       primaryKey:'',
-      userName: ''
+      siteUserName: '',
+      siteID:''
     });
     const formState = reactive({
       total: 0,
@@ -87,6 +98,7 @@ export default defineComponent({
       {title: '用户类型', dataIndex: 'roleName', key: 'roleName',width:120, align: "center"},
       {title: '性别', dataIndex: 'genderName', key: 'genderName', align: "center"},
       {title: '联系电话', dataIndex: 'mobile', key: 'mobile', align: "center"},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', align: "center"},
       {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},
     ];
     const pagination = computed(() => ({
@@ -97,6 +109,12 @@ export default defineComponent({
       showTotal: total => getPaginationTotalTitle(total)
     }));
 
+    const getAllSites = () => {
+      getSiteList(searchParams).then((result :any) => {
+        allSites.value = result.list;
+        console.log('allSites',allSites);
+      })
+    }
     const dataList = ref([]);
 
     const handleTableChange: TableProps['onChange'] = (pag: { pageSize: number; current: number },) => {
@@ -145,6 +163,7 @@ export default defineComponent({
 
     const loadData = async function () {
       formState.loading = true;
+      await getAllSites();
       const result: any = await getSiteUserList(searchParams);
       dataList.value = result.list;
       formState.total = result.total;
@@ -152,15 +171,16 @@ export default defineComponent({
     }
 
     const onAdd =()=>{
-      tabsViewStore.addTabByPath('/baseSettings/user/add', {id:null});
+      tabsViewStore.addTabByPath('/baseSettings/user/add', {id:null,op:1});
     };
 
     const onEdit = (id: string) => {
-      tabsViewStore.addTabByPath('/baseSettings/user/edit', {id:id});
+      tabsViewStore.addTabByPath('/baseSettings/user/edit', {id:id,op:2});
     };
 
     return {
       formRef,
+      allSites,
       searchParams,
       formState,
       columns,