Skip to content

A
amos-boot-biz
Commit c51777bc authored by tianbo's avatar tianbo
Browse files
Options

feat(jg): bug修复

- 在 getRegistrationFormUrl 方法中添加 uscUnitName 字段映射 - 在 getRegistrationFormStream 方法中添加 uscUnitName 字段映射 - 新增 queryBaseUnitNameByCreditCode 方法用于信用代码查询单元名称 - 重构综合统计分析服务中的组织代码过滤逻辑 - 为使用单位添加监管标签默认值 - 更新 JgUseRegistrationMapper.xml 中的关联查询以获取正确的属性单元名称 - 在 TCM 模块中添加企业监管标签默认配置和业务逻辑
parent c9b26dec
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 6 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ c51777bc
......@@ -982,11 +982,12 @@
tjin."CONSTRUCTION_IS_XI_XIAN" as installIsXixian,
tjin."CONSTRUCTION_LEADER_PHONE" as installLeaderPhone ,
tjin."USC_DATE" as installStartDate ,
tjin."USC_UNIT_NAME" as installPropertyUnitName ,
ibjui."ESTATE_UNIT_NAME" as installPropertyUnitName ,
tjin."PROXY_STATEMENT_ATTACHMENT" as installProxyStatementAttachment ,
tjin."CONSTRUCTION_CONTRACT_ATTACHMENT" as installContractAttachment ,
tjin."CONSTRUCTION_OTHER_ACCESSORIES" as insOtherAccessories
FROM "idx_biz_jg_construction_info" AS tjin
left join "idx_biz_jg_use_info" AS ibjui on tjin."RECORD" = ibjui."RECORD"
WHERE tjin."RECORD" = #{id} order by tjin.USC_DATE desc
LIMIT 1
</select>
......@@ -996,7 +997,7 @@
ibjci."CONSTRUCTION_LEADER_NAME" as installLeaderName ,
ibjci."CONSTRUCTION_LEADER_PHONE" as installLeaderPhone ,
ibjci."USC_DATE" as installStartDate ,
ibjci."USC_UNIT_NAME" as installPropertyUnitName ,
ibjui."ESTATE_UNIT_NAME" as installPropertyUnitName ,
ibjci."PROXY_STATEMENT_ATTACHMENT" as installProxyStatementAttachment ,
ibjci."CONSTRUCTION_CONTRACT_ATTACHMENT" as installContractAttachment ,
ibjci."CONSTRUCTION_OTHER_ACCESSORIES" as insOtherAccessories,
......
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/CommonServiceImpl.java
View file @ c51777bc
......@@ -2772,6 +2772,13 @@ public class CommonServiceImpl implements ICommonService {
serviceClass = CommonServiceImpl.class,
queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
secondParamValue = "JY,JC"
),
@FieldMapping.FieldMap(
sourceField = "uscUnitName",
paramIndex = 1,
targetField = "uscUnitName",
serviceClass = CommonServiceImpl.class,
queryMethod = "queryBaseUnitNameByCreditCode"
)
})
public Map<String, Object> getRegistrationFormUrl(String manageType, JSONObject jsonObject) {
......@@ -2808,6 +2815,14 @@ public class CommonServiceImpl implements ICommonService {
}
}
@FieldMapping({
@FieldMapping.FieldMap(
sourceField = "uscUnitName",
targetField = "uscUnitName",
serviceClass = CommonServiceImpl.class,
queryMethod = "queryBaseUnitNameByCreditCode"
)
})
@Override
public void getRegistrationFormStream(JSONObject formData, String manageType, HttpServletResponse response) {
formData.putAll(buildFile(manageType, formData));
......@@ -3481,4 +3496,8 @@ public class CommonServiceImpl implements ICommonService {
}
return !ValidationUtil.isEmpty(propertyUnitInfo) ? propertyUnitInfo : Maps.newHashMap();
}
public String queryBaseUnitNameByCreditCode(String unitCreditCode) {
return ValidationUtil.isEmpty(unitCreditCode) ? unitCreditCode : commonMapper.queryUnitNameByCreditCode(unitCreditCode);
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @ c51777bc
......@@ -314,7 +314,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
JSONObject filterParams = null;
String licensesStatusStr = "";
String filterType = filter.getString("filterType");
String orgCode = filter.getString("orgCode");
personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.person.getCode(), true);
if (!ObjectUtils.isEmpty(filter.get("filterParams"))) {
filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
if (filterParams.containsKey("dp_filter_business_type")) {
......@@ -327,8 +328,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
}
}
// 组装人员过滤条件
String orgCode = filter.getString("orgCode");
personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.person.getCode(), true);
this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
if ("custom".equals(filterType)) {
JSONArray leftGroup = filterParams.getJSONArray("group1");
......@@ -692,8 +691,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
dto.get("unitType").toString().contains("安装改造维修单位"))) {
permissionStatus = noneStr;
}
if (dto.get("unitType").equals("使用单位") || dto.get("unitType").equals("个人主体")) {
if (dto.get("unitType").toString().contains("使用单位") || dto.get("unitType").equals("个人主体")) {
permissionStatus = null;
if (ValidationUtil.isEmpty(dto.get("regulatoryLabels"))) {
dto.put("regulatoryLabels", "三级管控");
}
}
dto.put("permissionStatus", permissionStatus);
list.add(dto);
......
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
View file @ c51777bc
......@@ -60,6 +60,7 @@ import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
......@@ -104,6 +105,10 @@ public class TzBaseEnterpriseInfoServiceImpl
* 企业管理员变更缓存key前缀
*/
private final static String adminChange = "ADMIN_CHANGE_";
@Value("${enterprise.regulatoryLabels.default.value:三级管控}")
private String defaultRegulatoryLabels;
@Autowired
RedisUtil redisUtil;
@Autowired
......@@ -241,6 +246,9 @@ public class TzBaseEnterpriseInfoServiceImpl
IPage<TzBaseEnterpriseInfoDto> page2 = this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCode, sortMap, officeRegion);
page2.getRecords().forEach(info -> {
info.setEnableStatus(info.getIsDelete() ? "停用" : "启用");
if (ValidationUtil.isEmpty(info.getRegulatoryLabels()) && (info.getUnitType().contains(UnitTypeEnum.sydw.getName()) || info.getUnitType().equals(UnitTypeEnum.grzt.getName()))) {
info.setRegulatoryLabels(defaultRegulatoryLabels);
}
});
return page2;
} catch (Exception ex) {
......@@ -1261,6 +1269,11 @@ public class TzBaseEnterpriseInfoServiceImpl
tzBaseEnterpriseInfo.setAppId(regUnitInfo.getAppId());
tzBaseEnterpriseInfo.setUnitType(String.join("#", unitTypes));
// 添加使用单位类型的，并且原企业标签为空则默认给三级管控
if (ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getRegulatoryLabels()) && Arrays.asList(unitTypes).contains(UnitTypeEnum.sydw.getName())) {
tzBaseEnterpriseInfo.setRegulatoryLabels(defaultRegulatoryLabels);
}
boolean updateResult = this.updateById(tzBaseEnterpriseInfo);
if (updateResult) {
log.info("更新企业信息, 单位类型 => {}", tzBaseEnterpriseInfo.getUseUnitCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment