Merge remote-tracking branch 'origin/master'

# Conflicts:
#	doc/待更新脚本

doc/待更新脚本

@@ -1,3 +1,5 @@
+--2024-5-8 企业表索引
+ALTER TABLE `employmentsitedb`.`pc_firm` ADD INDEX `nameIndex` ( `FirmName` );
 --2024-05-08 日志、任务路由调整
 update sys_menu set IsVisible= 0  where MenuNo='T0104';
 update sys_menu set ParentMenuNo = 'T01' where ParentMenuNo='T0104';

h5app/src/views/pages/company/edit.vue

@@ -564,6 +564,7 @@ export default defineComponent({
           formState.dataModel.industryID = matchedFirmInfo.industryID;
           formState.dataModel.industryName = matchedFirmInfo.industryName;
           formState.dataModel.signInPoliticalArea = matchedFirmInfo.signInPoliticalArea;
+          formState.dataModel.establishmentTime = matchedFirmInfo.establishmentTime;
           await setInfoLoadingOpen(false);
           infoAlterData.title = "提示";
           infoAlterData.message = "同步成功！";

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -519,6 +519,7 @@ export default defineComponent({
           formState.dataModel.industryID = matchedFirmInfo.industryID;
           formState.dataModel.industryName = matchedFirmInfo.industryName;
           formState.dataModel.signInPoliticalArea = matchedFirmInfo.signInPoliticalArea;
+          formState.dataModel.establishmentTime = matchedFirmInfo.establishmentTime;
           await setInfoLoadingOpen(false);
           infoAlterData.title = "提示";
           infoAlterData.message = "同步成功！";

h5app/src/views/pages/jobhunt/detail.vue

@@ -32,10 +32,6 @@
             <ion-label>姓名</ion-label>
             <ion-text>{{ dataModel.name }}</ion-text>
           </div>
-          <div class="form-detail">
-            <ion-label>身份证号码</ion-label>
-            <ion-text>{{ dataModel.identityNumberShow }}</ion-text>
-          </div>
           <div class="form-detail">
             <ion-label>性别</ion-label>
             <ion-text>{{ dataModel.genderName }}</ion-text>

h5app/src/views/sapp/tabUser.vue

@@ -276,7 +276,12 @@ onMounted(() => {
     position: relative;
     z-index: 2;
 
+    .user_img {
+      width: 30%;
+    }
+
     .user_text{
+      width: 44%;
       padding-left: 5px;
 
       h2 {
@@ -290,6 +295,10 @@ onMounted(() => {
         color: #899099;
       }
     }
+
+    .qr_img {
+      width: 28%;
+    }
   }
 
   .user_info::before{

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

@@ -66,6 +66,7 @@ public class SiteUserController {
         } else {
             if (cipherType != null && cipherType == 1) {
                 data.setIdCard(stringUtils.desensitizeData(data.getIdCard(), "************", 3, 4));
+                data.setSocialSecurityCard(stringUtils.desensitizeData(data.socialSecurityCard, "****", 3, 3));
             }
         }
         return RespGenerstor.success(data);
@@ -89,7 +90,7 @@ public class SiteUserController {
                                @RequestParam(required = false) String siteID) throws Exception{
         PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex, pageSize, siteUserIDList, siteUserName, siteID, null, 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()) {
@@ -102,7 +103,6 @@ public class SiteUserController {
             row.add(item.genderName);
             row.add(item.mobile);
             row.add(item.age);
-            row.add(item.idCard);
             row.add(item.siteName);
             rowsData.add(row);
         }

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

@@ -82,8 +82,9 @@ public class JobUserController {
             }
         } else {
             if (cipherType != null && cipherType == 1) {
-                // 身份证脱敏
+                // 信息脱敏
                 data.setIdentityNumber(stringUtils.desensitizeData(data.getIdentityNumber(), "************", 3, 4));
+                data.setSocialSecurityCard(stringUtils.desensitizeData(data.getSocialSecurityCard(), "****", 3, 3));
             }
         }
         return RespGenerstor.success(data);

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

@@ -73,10 +73,11 @@ public class SiteUserImpl implements SiteUserService {
     public PageInfo<SiteUserVo> getList(int pageIndex, int pageSize, List<String> siteUserIDList, String siteUserName, String siteID, String roleName, String regionCode, String userNo,String userID) {
         PageHelper.startPage(pageIndex, pageSize);
         List<SiteUserVo> dataList = userInfoCQuery.getList(stringUtils.ListToInSql(siteUserIDList), siteUserName, siteID, roleName, regionCode, userNo, userID);
-        // 身份证脱敏
+        // 重要信息脱敏
         dataList.forEach(item -> {
             item.setAge(dateUtils.getAgeForIdCard(item.idCard));
             item.setIdCard(stringUtils.desensitizeData(item.idCard, "************", 3, 4));
+            item.setSocialSecurityCard(stringUtils.desensitizeData(item.socialSecurityCard, "****", 3, 3));
         });
         PageInfo<SiteUserVo> result = new PageInfo(dataList);
         return result;

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

@@ -448,6 +448,13 @@ public class CompanyServiceImpl implements CompanyService {
         companyVo.setCompanyEmail(pcFirm.getEmail());
         companyVo.setCompanyAddress(pcFirm.getLatestAddress());
         companyVo.setBusinScope(pcFirm.getBusinessScope());
+        if (pcFirm.getEstablishmentDate() != null) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                companyVo.setEstablishmentTime(dateFormat.parse(pcFirm.getEstablishmentDate()));
+            } catch (Exception e) {
+            }
+        }
         if (pcFirm.getIndustry() != null && !pcFirm.getIndustry().isBlank()) {
             // 获取行业数据
             List<PcIndustry> allList = industryService.getAllList();

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

@@ -61,10 +61,11 @@ public class JobUserServiceImpl implements JobUserService {
         }
         PageHelper.startPage(pageIndex, pageSize);
         List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, curLoginUserSiteID, regionCode, startDate, endDate);
-        // 身份证脱敏
+        // 信息脱敏
         list.forEach(item -> {
             item.setAge(dateUtils.getAgeForIdCard(item.getIdentityNumber()));
             item.setIdentityNumber(stringUtils.desensitizeData(item.getIdentityNumber(), "************", 3, 4));
+            item.setSocialSecurityCard(stringUtils.desensitizeData(item.getSocialSecurityCard(), "****", 3, 3));
         });
         PageInfo<JobUserVo> result = new PageInfo(list);
 

vue/src/views/baseSettings/siteUser/detail.vue

@@ -6,7 +6,6 @@
       <a-descriptions-item label="性别">{{ siteUserInfo.genderName }}</a-descriptions-item>
       <a-descriptions-item label="联系电话">{{ siteUserInfo.mobile }}</a-descriptions-item>
       <a-descriptions-item label="工号">{{ siteUserInfo.userNo }}</a-descriptions-item>
-      <a-descriptions-item label="身份证">{{ siteUserInfo.idCard }}</a-descriptions-item>
       <a-descriptions-item label="用户类型">{{ siteUserInfo.roleName }}</a-descriptions-item>
       <a-descriptions-item label="所属驿站">{{ siteUserInfo.siteName }}</a-descriptions-item>
       <a-descriptions-item label="最后更新人">{{ siteUserInfo.updateUserName }}</a-descriptions-item>
@@ -16,7 +15,6 @@
     </a-descriptions>
     <a-divider orientation="left">其他信息</a-divider>
     <a-descriptions bordered>
-      <a-descriptions-item label="社保卡号">{{ siteUserInfo.socialSecurityCard }}</a-descriptions-item>
       <a-descriptions-item label="民族">{{ siteUserInfo.nationName }}</a-descriptions-item>
       <a-descriptions-item label="政治面貌">{{ siteUserInfo.politicsStatusName }}</a-descriptions-item>
       <a-descriptions-item label="最高学历">{{ siteUserInfo.cultureRankName }}</a-descriptions-item>

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

@@ -118,7 +118,6 @@ export default defineComponent({
       {title: '性别', dataIndex: 'genderName', key: 'genderName', align: "center"},
       {title: '联系电话', dataIndex: 'mobile', key: 'mobile', align: "center"},
       {title: '年龄', dataIndex: 'age', key: 'age', align: "center"},
-      {title: '身份证号', dataIndex: 'idCard', key: 'idCard', align: "center"},
       {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', align: "center"},
       {title: '操作', key: 'operation', fixed: 'right', width: 150, align: "center"},
     ];

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

@@ -212,7 +212,6 @@ export default defineComponent({
           `${searchParamsState.pageSize * (searchParamsState.pageIndex - 1) + item.index + 1}`,
       },
       {title: '姓名', dataIndex: 'name', key: 'name', width: 100,align: "center"},
-      {title: '公民身份号码', dataIndex: 'identityNumber', key: 'identityNumber', width: 170,align: "center"},
       {title: '性别', dataIndex: 'genderName', key: 'genderName', width: 80,align: "center"},
       {title: '民族', dataIndex: 'nationName', key: 'nationName', width: 80, align: "center"},
       {title: '联系电话', dataIndex: 'userMobile', key: 'userMobile',align: "center"},

vue/src/views/jobUserManager/jobuser/vitae.vue

@@ -50,7 +50,6 @@
         <a-divider orientation="left">基本信息</a-divider>
         <a-descriptions :column="2" bordered style="margin-left: 25px;">
           <a-descriptions-item label="出生地">{{ jobUserInfo.birthPlace }}</a-descriptions-item>
-          <a-descriptions-item label="身份证号">{{ jobUserInfo.identityNumber }}</a-descriptions-item>
           <a-descriptions-item label="重点人员类别">{{ jobUserInfo.keyTypeName }}</a-descriptions-item>
           <a-descriptions-item label="健康状况">{{ jobUserInfo.healthName }}</a-descriptions-item>
           <a-descriptions-item label="就业状态">{{ jobUserInfo.jobStatusName }}</a-descriptions-item>