Merge remote-tracking branch 'origin/master'

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

@@ -80,17 +80,19 @@ public class SiteUserController {
                                @RequestParam(required = false) String siteID) throws Exception{
         PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex, pageSize, siteUserIDList, siteUserName, siteID, null, null, null);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-        data.setTitles(Arrays.asList(new String[]{"序号","人员名称","角色", "性别", "联系电话","所属驿站"}));
+        data.setTitles(Arrays.asList(new String[]{"序号", "工号", "人员名称", "角色", "性别", "联系电话", "身份证号", "所属驿站"}));
         int i = 0;
         List<List<Object>> rowsData= new ArrayList();
         for (SiteUserVo item : result.getList()) {
             List<Object> row = new ArrayList();
             ++i;
             row.add(i);
+            row.add(item.userNo);
             row.add(item.siteUserName);
             row.add(item.roleName);
             row.add(item.genderName);
             row.add(item.mobile);
+            row.add(item.idCard);
             row.add(item.siteName);
             rowsData.add(row);
         }

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

@@ -3,6 +3,7 @@ package com.hz.employmentsite.services.impl.baseSettings;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseException;
+import com.hz.employmentsite.mapper.PcCompanyMapper;
 import com.hz.employmentsite.mapper.PcSiteInstitutionMapper;
 import com.hz.employmentsite.mapper.PcSiteMapper;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
@@ -42,10 +43,13 @@ public class SiteInfoImpl implements SiteInfoService {
     @Autowired
     private PcSiteInstitutionMapper pcSiteInstitutionMapper;
 
+    @Autowired
+    private PcCompanyMapper pcCompanyMapper;
+
     @Override
     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,institutionID,regionCode,streetCode);
+        List<SiteInfoVo> dataList = siteInfoCQuery.getList(stringUtils.ListToInSql(siteIDList), siteCode, siteName, institutionID, regionCode, streetCode);
         PageInfo<SiteInfoVo> result = new PageInfo(dataList);
         return result;
     }
@@ -183,17 +187,31 @@ public class SiteInfoImpl implements SiteInfoService {
     public Integer delete(List<String> idList){
         var result = 0;
         for (String curSiteID: idList) {
+            // 关联站点工作人员检查
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             siteUserExp.or().andSiteIDEqualTo(curSiteID);
             var curSiteUserList = pcSiteUserMapper.selectByExample(siteUserExp).stream().toList();
-            if( curSiteUserList != null && curSiteUserList.size()>0){
-                throw new BaseException("10004","所选驿站站点已有关联站点人员信息，不允许删除！");
-            }else{
-                PcSiteExample contactExample = new PcSiteExample();
-                contactExample.or().andSiteIDEqualTo(curSiteID);
-                pcSiteMapper.deleteByExample(contactExample);
-                result += pcSiteMapper.deleteByExample(contactExample);
+            if (curSiteUserList != null && curSiteUserList.size() > 0) {
+                throw new BaseException("10004", "所选驿站站点已有关联站点人员信息，不允许删除！");
+            }
+            // 关联企业检查
+            PcCompanyExample companyExample = new PcCompanyExample();
+            companyExample.or().andSiteIDEqualTo(curSiteID);
+            List<PcCompany> companyList = pcCompanyMapper.selectByExample(companyExample).stream().toList();
+            if (!companyList.isEmpty()) {
+                throw new BaseException("10004", "所选驿站站点已有关联企业信息信息，不允许删除！");
             }
+
+            // 删除站点-机构关联表
+            PcSiteInstitutionExample siteInstitutionExample = new PcSiteInstitutionExample();
+            siteInstitutionExample.or().andSiteIDEqualTo(curSiteID);
+            pcSiteInstitutionMapper.deleteByExample(siteInstitutionExample);
+
+            // 删除主表
+            PcSiteExample contactExample = new PcSiteExample();
+            contactExample.or().andSiteIDEqualTo(curSiteID);
+            pcSiteMapper.deleteByExample(contactExample);
+            result += pcSiteMapper.deleteByExample(contactExample);
         }
         return result;
     }

vue/src/views/baseSettings/siteInfo/detail.vue

@@ -13,6 +13,12 @@
       <a-descriptions-item label="经度">{{ siteInfo.siteLongitude }}</a-descriptions-item>
       <a-descriptions-item label="纬度">{{ siteInfo.siteLatitude }}</a-descriptions-item>
     </a-descriptions>
+    <a-divider orientation="left">站点工作人员</a-divider>
+    <a-table :columns="siteUserColumns" :data-source="siteUserList" :scroll="{ x:'100%', y: 200 }"
+             :pagination="siteUserTabPagination"
+             @change="siteUserTabChange"
+             bordered>
+    </a-table>
     <a-divider orientation="left">其他信息</a-divider>
     <a-descriptions bordered>
       <a-descriptions-item label="备注">{{ siteInfo.remark }}</a-descriptions-item>
@@ -21,11 +27,15 @@
 </template>
 
 <script setup lang="ts">
-import {onMounted, reactive} from "vue";
+import {computed, onMounted, reactive, ref} from "vue";
 import {getSiteByID} from "@/api/baseSettings/siteInfo";
+import type {TableColumnsType, TableProps} from "ant-design-vue";
+import {getSiteUserList} from "@/api/baseSettings/userInfo";
+import {getPaginationTotalTitle} from "@/utils/common";
 
 // 站点信息
 const siteInfo = reactive({
+  siteID: "",
   siteCode: "",
   siteName: "",
   institutionName: "",
@@ -38,6 +48,40 @@ const siteInfo = reactive({
   siteLatitude: "",
   remark: "",
 })
+// 站点人员查询数据
+const siteUserSearchParams = reactive({
+  pageIndex: 1,
+  pageSize: 20,
+  siteUserName: '',
+  siteID: '',
+  userNo: ""
+});
+// 站点人员表结构
+const siteUserColumns: TableColumnsType = [
+  {
+    title: '序号',
+    align: "center",
+    key: 'siteUserID',
+    customRender: item => `${siteUserSearchParams.pageSize * (siteUserSearchParams.pageIndex - 1) + item.index + 1}`
+  },
+  {title: '工号', dataIndex: 'userNo', key: 'userNo', align: "center"},
+  {title: '人员名称', dataIndex: 'siteUserName', key: 'siteUserName', align: "center"},
+  {title: '性别', dataIndex: 'genderName', key: 'genderName', align: "center"},
+  {title: '联系电话', dataIndex: 'mobile', key: 'mobile', align: "center"},
+];
+// 站点人员数据
+const siteUserList = ref([]);
+const siteUserTabFormState = reactive({
+  total: 0,
+  loading: false
+});
+const siteUserTabPagination = computed(() => ({
+  total: siteUserTabFormState.total,
+  current: siteUserSearchParams.pageIndex,
+  pageSize: siteUserSearchParams.pageSize,
+  showSizeChanger: true,
+  showTotal: total => getPaginationTotalTitle(total)
+}));
 
 // 站点数据加载
 function loadData(siteID: any) {
@@ -46,8 +90,24 @@ function loadData(siteID: any) {
       siteInfo[key] = result[key];
     })
   });
+  findSiteUser(siteID)
 }
 
+// 查询站点人员数据
+function findSiteUser(siteId: string) {
+  siteUserSearchParams["siteID"] = siteId;
+  getSiteUserList(siteUserSearchParams).then((result: any) => {
+    siteUserList.value = result.list;
+  });
+}
+
+// 站点人员表格变更
+const siteUserTabChange: TableProps['onChange'] = (pag: { pageSize: number; current: number },) => {
+  siteUserSearchParams.pageIndex = pag.current;
+  siteUserSearchParams.pageSize = pag.pageSize;
+  findSiteUser(siteInfo.siteID);
+};
+
 // 页面初始化
 onMounted(() => {
   const id = history.state.params?.id;