fix(jg):密评完整性问题处理

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

@@ -50,7 +50,15 @@
             FROM tzs_jg_maintenance_contract_eq ede
                      LEFT JOIN idx_biz_jg_supervision_info si ON si."RECORD" = ede.equ_id
             WHERE ede.equip_transfer_id = tjmc.sequence_nbr
-        ) AS orgBranchCodes
+        ) AS orgBranchCodes,
+        (
+            SELECT mri.ME_MASTER1_PHONE AS phone
+            FROM tzs_jg_maintenance_contract_eq ede
+            LEFT JOIN idx_biz_jg_maintenance_record_info mri
+            ON mri."RECORD" = ede.equ_id
+            WHERE ede.equip_transfer_id = tjmc.sequence_nbr
+            order by mri.REC_DATE limit 1
+        ) AS phone
         FROM
             tzs_jg_maintenance_contract tjmc
     </sql>

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/IdxBizJgProjectContraptionServiceImplService.java

@@ -252,6 +252,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
      */
     @Override
     public IPage<IdxBizJgProjectContraption> proConPageByParams(int current, int size, String sort, Map<String, String> params, ReginParams reginParams) {
+        try {
             Page<IdxBizJgProjectContraption> page = new Page<>();
             page.setCurrent(current);
             page.setSize(size);
@@ -412,6 +413,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
                                     .collect(Collectors.joining())
                     );
                     record.setCompanyType(companyType2);
+
                     // 来源类型：前端控制编辑按钮显示隐藏
                     record.setRegType(CommonServiceImpl.genRegTypeByDataSource(record.getDataSource()));
                     record.setIsIntoManagementName(IsIntoManagementEnum.getName(record.getIsIntoManagement()));
@@ -426,8 +428,23 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
                 pageList.getRecords().forEach(record -> record.setCanDelete(canDeleteMap.get(record.getSequenceNbr()+"")));
                 //判断是否有检验结果录入
                 judgeCheckResult(pageList.getRecords());
+                List<IdxBizJgUseInfo> useInfos = useInfoService.lambdaQuery().select(IdxBizJgUseInfo::getRecord,IdxBizJgUseInfo::getPhone)
+                        .in(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionIdList).list();
+                useInfos.forEach(info -> System.out.println("record=" + info.getRecord() + ", phone=" + info.getPhone()));
             }
             return pageList;
+        } catch (Exception ex) {
+            String msg = ex.getMessage() == null ? "" : ex.getMessage();
+            if (msg.contains("eyibc decrypt error")
+                    || msg.contains("EYIBCException")
+                    || msg.contains("olym jdbc error")
+                    || msg.contains("数据非法")
+                    || msg.contains("Code: 100023:sql parse error")
+                    || msg.contains("decrypt error, code: -65")) {
+                throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
+            }
+            throw new BadRequest("系统内部错误，请联系管理员。");
+        }
     }
 
     /**

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/JgMaintenanceContractServiceImpl.java

@@ -118,6 +118,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      * 分页查询
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, String sort, JgMaintenanceContractDto dto, ReginParams reginParams, String client) {
+        try {
             if (ObjectUtils.isEmpty(dto)) {
                 dto = new JgMaintenanceContractDto();
             }
@@ -157,6 +158,18 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contractList.setRecords(records);
             BeanUtils.copyProperties(contractList, result);
             return result;
+        } catch (Exception ex) {
+            String msg = ex.getMessage() == null ? "" : ex.getMessage();
+            if (msg.contains("eyibc decrypt error")
+                    || msg.contains("EYIBCException")
+                    || msg.contains("olym jdbc error")
+                    || msg.contains("数据非法")
+                    || msg.contains("Code: 100023:sql parse error")
+                    || msg.contains("decrypt error, code: -65")) {
+                throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
+            }
+            throw new BadRequest("系统内部错误，请联系管理员。");
+        }
     }
 
     /**

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

@@ -233,13 +233,17 @@ public class TzBaseEnterpriseInfoServiceImpl
 //			}
 			SortVo sortMap = userInfoService.sortFieldConversion(sort);
 			// 密评专用（查tz_flc_reg_unit_info表中的admin_login_pwd字段，以用于验证密评数据完整性）
-			regUnitInfoService.lambdaQuery().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfoDto.getUseUnitCode()).select(RegUnitInfo::getUnitCode, RegUnitInfo::getAdminLoginPwd);
+
+			List<RegUnitInfo> regUnitInfoList = regUnitInfoService.lambdaQuery().select(RegUnitInfo::getUnitCode, RegUnitInfo::getAdminLoginPwd)
+					.eq(RegUnitInfo::getName, tzBaseEnterpriseInfoDto.getUseUnit()).list();
+			regUnitInfoList.forEach(info -> System.out.println("unitCode=" + info.getUnitCode() + ", adminLoginPwd=" + info.getAdminLoginPwd()));
 			return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCode, sortMap, officeRegion);
 		} catch (Exception ex) {
 			String msg = ex.getMessage() == null ? "" : ex.getMessage();
 			if (msg.contains("eyibc decrypt error")
 					|| msg.contains("EYIBCException")
 					|| msg.contains("olym jdbc error")
+					|| msg.contains("100022:")
 					|| msg.contains("数据非法")
 					|| msg.contains("decrypt error, code: -65")) {
 				throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");