fix(jg):更名变更，单位变更三级审核业务处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml

@@ -10,15 +10,28 @@
     </delete>
 
     <select id="queryPageListByChangeIds" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto">
-        SELECT
-            *
-        FROM tzs_jg_resume_info
-        WHERE is_delete = '0' and
+        SELECT r.*
+        FROM tzs_jg_resume_info r
+        WHERE r.is_delete = '0'
+        AND (
         <foreach collection="equIds" item="id" open="(" separator="or" close=")">
-            equ_id like concat('%', #{id}, '%')
+            r.equ_id LIKE CONCAT('%', #{id}, '%')
         </foreach>
-        order by rec_date desc
+        -- 如果 eq 表有对应数据也能查出来
+        <if test="equIds != null and equIds.size() > 0">
+            OR r.sequence_nbr IN (
+            SELECT resume_id
+            FROM tzs_jg_resume_info_eq
+            WHERE equ_id IN
+            <foreach collection="equIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            )
+        </if>
+        )
+        ORDER BY r.rec_date DESC
     </select>
+
     <select id="selectResumeInfoByEquips" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto">
         SELECT
             sequence_nbr,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -1031,21 +1031,20 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
                     BeanUtil.copyProperties(enterprise, esBaseEnterpriseInfo);
                     enterpriseInfoDao.save(esBaseEnterpriseInfo);
+                    String platformName = CompanyTypeEnum.INDIVIDUAL.getName().equals(enterprise.getUnitType())
+                            ? jgChangeRegistrationName.getUseUnitCreditCode() + "_" + newName
+                            : newName;
                     // 人员更新冗余的单位信息
-                    List<TzsUserInfo> userOfOneUnit = useInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterprise.getUseUnitCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));
+                    List<TzsUserInfo> userOfOneUnit = useInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterprise.getUseCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));
                     Iterable<EsUserInfo> userInfosEs = esUserInfoDao.findAllById(userOfOneUnit.stream().map(u -> String.valueOf(u.getSequenceNbr())).collect(Collectors.toList()));
                     userInfosEs.forEach(esUserInfo -> {
                         esUserInfo.setUnitType(esBaseEnterpriseInfo.getUnitType());
                         esUserInfo.setSuperviseOrgName(esBaseEnterpriseInfo.getSuperviseOrgName());
                         esUserInfo.setSuperviseOrgCode(esBaseEnterpriseInfo.getSuperviseOrgCode());
                         esUserInfo.setOfficeRegion(esBaseEnterpriseInfo.getOfficeRegion());
+                        esUserInfo.setUnitName(platformName);
                     });
-                    if (userInfosEs.iterator().hasNext()) {
-                        esUserInfoDao.saveAll(userInfosEs);
-                    }
-                    String platformName = CompanyTypeEnum.INDIVIDUAL.getName().equals(enterprise.getUnitType())
-                            ? jgChangeRegistrationName.getUseUnitCreditCode() + "_" + newName
-                            : newName;
+
                     if (CompanyTypeEnum.INDIVIDUAL.getName().equals(enterprise.getUnitType())){
                         useInfoMapper.updateBatchUnitName(userOfOneUnit, platformName);
                         // 更新tz_base_individuality信息
@@ -1061,6 +1060,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                             Privilege.agencyUserClient.update(userModel, userModel.getUserId());
                         }
                     }
+                    if (userInfosEs.iterator().hasNext()) {
+                        esUserInfoDao.saveAll(userInfosEs);
+                    }
 
                     try {
                         Privilege.companyClient.updateCompanyName(enterprise.getUseCode(), platformName);