Skip to content

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

Merge remote-tracking branch 'origin/develop_tzs_test' into develop_tzs_register

parents e09a21c0 aba59b47
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 26 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java
View file @ 0032511b
......@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
......@@ -36,7 +37,6 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.RegionCodeTypeHandle
import com.yeejoin.amos.boot.module.jg.biz.edit.utils.DiffUtils;
import com.yeejoin.amos.boot.module.jg.biz.service.*;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.*;
import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
......@@ -786,7 +786,6 @@ public class CommonEquipDataProcessService {
return changeData;
}
public Map<String, Object> getEquipDetailByRecord(String record) {
Map<String, Object> re = new HashMap<>();
IdxBizJgRegisterInfo registerInfo = jgUseRegistrationService.getIdxBizJgRegisterInfoService().getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record));
......@@ -834,6 +833,8 @@ public class CommonEquipDataProcessService {
result.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
}
}
// 返回当前登录人单位类型（企业还是监管、审批）
result.put("loginUnitType", commonService.getSelectedOrgInfo().getCompany().getLevel());
// 返回是否做过除历史登记外的其他业务
result.put("inOtherBusiness", !jgUseRegistrationService.getJgUseRegistrationMapper().selectListForSelfDiscard(Lists.newArrayList(record)).isEmpty());
result.replaceAll((key, value) -> "null".equals(value) ? null : value);
......
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 @ 0032511b
......@@ -720,7 +720,7 @@ public class CommonServiceImpl implements ICommonService {
/**
* 用户选择信心redis获取
**/
protected ReginParams getSelectedOrgInfo() {
public ReginParams getSelectedOrgInfo() {
return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
}
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 0032511b
......@@ -3612,6 +3612,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
IdxBizJgUseInfo useInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
// 设计信息
IdxBizJgDesignInfo designInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgDesignInfo.class);
// 维保信息
IdxBizJgMaintenanceRecordInfo maintenanceInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
// 制造信息
IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgFactoryInfo.class);
// 施工信息
......@@ -3715,6 +3717,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
designInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("DESIGNINFO_SEQ")));
iIdxBizJgDesignInfoService.saveOrUpdateData(designInfo);
if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
// 维保信息
maintenanceInfo.setRecord(record);
maintenanceInfo.setRecDate(date);
maintenanceInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceInfo);
}
// 制造信息
factoryInfo.setRecord(record);
factoryInfo.setRecDate(date);
......
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/JgUseRegistrationServiceImpl.java
View file @ 0032511b
......@@ -1812,10 +1812,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
} else {
//如果是特殊的历史设备需要更新安装信息
//如果是特殊的历史设备需要更新安装信息和维保信息
String dataSource = jsonObject.getString("DATA_SOURCE");
if ("jg_his_black".equals(dataSource)) {
if (!ValidationUtil.isEmpty(dataSource) && dataSource.startsWith("jg_his_black")) {
this.historyEquUpdateInstallInfo(jsonObject);
// 电梯维保信息
if (EquipmentClassifityEnum.DT.getCode().equals(jsonObject.getString("equList"))) {
this.historyEquUpdateMaintenanceInfo(jsonObject);
}
}
// 流程结束
jgUseRegistration.setStatus(taskCode);
......@@ -4562,7 +4566,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this.historyEquUpdateInstallInfo(map);
// 设备维保信息更新,只有电梯
if ("3000".equals(map.get("equList")) || "3000".equals(map.get("equListCode"))) {
if (EquipmentClassifityEnum.DT.getCode().equals(map.get("equList")) || EquipmentClassifityEnum.DT.getCode().equals(map.get("equListCode"))) {
this.historyEquUpdateMaintenanceInfo(map);
}
......@@ -4650,7 +4654,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
* 历史设备登记-》更新维保信息
*/
private void historyEquUpdateMaintenanceInfo(JSONObject map) {
IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (ValidationUtil.isEmpty(info)) {
info = new IdxBizJgMaintenanceRecordInfo();
}
info.setRecord(String.valueOf(map.get("equipId")));
String meUnitName = String.valueOf(map.get("meUnitName"));
info.setRecDate(new Date());
......@@ -4671,7 +4678,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
log.info("date转化失败");
}
info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
idxBizJgMaintenanceRecordInfoService.save(info);
idxBizJgMaintenanceRecordInfoService.saveOrUpdate(info);
}
/**
......@@ -4681,7 +4688,19 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (!ValidationUtil.isEmpty(constructionInfo.getSequenceNbr())) {
constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitName")) ? null : String.valueOf(map.get("uscUnitName")));
String uscUnitName = MapUtil.getStr(map, "uscUnitName");
if (!ValidationUtil.isEmpty(uscUnitName) && uscUnitName.contains("_") && uscUnitName.split("_").length == 2) {
constructionInfo.setUscUnitCreditCode(MapUtil.getStr(map, "uscUnitName").split("_")[0]);
constructionInfo.setUscUnitName(MapUtil.getStr(map, "uscUnitName").split("_")[1]);
} else {
TzBaseEnterpriseInfo baseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnitCode(uscUnitName);
if (!ValidationUtil.isEmpty(baseEnterpriseInfo)) {
constructionInfo.setUscUnitName(baseEnterpriseInfo.getUseUnit());
constructionInfo.setUscUnitCreditCode(baseEnterpriseInfo.getUseUnitCode());
} else {
constructionInfo.setUscUnitName(uscUnitName);
}
}
constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")));
constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
......
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/AQZSDPStatisticsServiceImpl.java
View file @ 0032511b
......@@ -528,7 +528,7 @@ public class AQZSDPStatisticsServiceImpl {
// tstCommonService.buildExpiryDateQueryBuilder(overdueQuery, "overdue", "licenses", "licenses.expiryDate");
Long overNumber = stCommonService.getNestedQueryStatisticCount(overdueQuery, StatisticalAnalysisEnum.person.getKey(), "licenses", "expiryDate", tzsCommonService.overdue);
BoolQueryBuilder nearQuery = new BoolQueryBuilder();
statisticalAnalysisService.personOrgCodeBoolMust(orgCode, nearQuery, StatisticalAnalysisEnum.person.getCode());
statisticalAnalysisService.personOrgCodeBoolMust(orgCode, nearQuery, StatisticalAnalysisEnum.inspectionPerson.getCode(), true);
Long nearNumber = stCommonService.getNestedQueryStatisticCount(nearQuery, StatisticalAnalysisEnum.person.getKey(), "licenses", "expiryDate", tzsCommonService.near);
dataMap.put(IssueTypeEnum.LICENSE_OVERDUE_PERSON.getName(), overNumber);
dataMap.put(IssueTypeEnum.LICENSE_EXPIRY_PERSON.getName(), nearNumber);
......
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 @ 0032511b
......@@ -328,7 +328,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
}
// 组装人员过滤条件
String orgCode = filter.getString("orgCode");
personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.person.getCode());
personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.person.getCode(), true);
this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
if ("custom".equals(filterType)) {
JSONArray leftGroup = filterParams.getJSONArray("group1");
......@@ -409,17 +409,19 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
return result;
}
public void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust, String type) {
String superviseOrgCodeKey = type.equals(StatisticalAnalysisEnum.person.getCode()) ? "superviseOrgCode" : "superviseOrgCode.keyword";
public void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust, String type, Boolean isPage) {
String superviseOrgCodeKey = type.equals(StatisticalAnalysisEnum.person.getCode()) || type.equals(StatisticalAnalysisEnum.inspectionPerson.getCode()) ? "superviseOrgCode" : "superviseOrgCode.keyword";
String officeRegion = commonMapper.getCompanyCodeByOrgCode(orgCode);
BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
BoolQueryBuilder queryBuilder2 = QueryBuilders.boolQuery();
EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
queryBuilder1.must(QueryBuilders.termQuery(superviseOrgCodeKey, "50"))
queryBuilder1.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, "50"))
.must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*"));
queryBuilder2.mustNot(QueryBuilders.termQuery(superviseOrgCodeKey, "50"))
.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, orgCode));
enhancedDynamicQueryBuilder.add(queryBuilder1, or);
queryBuilder2.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, orgCode));
if(type.equals(StatisticalAnalysisEnum.inspectionCompany.getCode()) || type.equals(StatisticalAnalysisEnum.inspectionPerson.getCode()) || isPage){
// queryBuilder2.mustNot(QueryBuilders.termQuery(superviseOrgCodeKey, "50"));
enhancedDynamicQueryBuilder.add(queryBuilder1, or);
}
enhancedDynamicQueryBuilder.add(queryBuilder2, or);
boolMust.must(enhancedDynamicQueryBuilder.build());
}
......@@ -581,7 +583,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
String orgCode = filter.getString("orgCode");
personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.company.getCode());
personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.company.getCode(), true);
JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
String filterType = filter.getString("filterType");
......@@ -3219,16 +3221,16 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
data = queryDpEquipStatistics(filter, request, builder, boolMust, tabTotalMap);
} else if (StatisticalAnalysisEnum.company.getCode().equals(businessType)) {
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.company.getCode());
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.company.getCode(),false);
data = queryDpCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
} else if (StatisticalAnalysisEnum.person.getCode().equals(businessType)) {
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.person.getCode());
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.person.getCode(),false);
data = queryDpPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
} else if (StatisticalAnalysisEnum.inspectionCompany.getCode().equals(businessType)) {
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.company.getCode());
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.inspectionCompany.getCode(),false);
data = queryDpInspectionCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
} else {
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.person.getCode());
personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.inspectionPerson.getCode(),false);
data = queryDpInspectionPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
}
......@@ -3315,6 +3317,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
}
private void getTypeCount(String businessType, Map<String, Object> tabTotalMap, String orgCode, List<Map<String, Object>> data) {
String officeRegion = commonMapper.getCompanyCodeByOrgCode(orgCode);
BoolQueryBuilder equipBoolMust = QueryBuilders.boolQuery();
equipBoolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
equipBoolMust.mustNot(QueryBuilders.termsQuery("STATUS", Arrays.asList("草稿", "已拒领", "待认领")));
......@@ -3333,18 +3336,20 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
companyBoolMust.must(companyUnitTypeBoolMust);
BoolQueryBuilder personBoolMust = QueryBuilders.boolQuery();
personOrgCodeBoolMust(orgCode, personBoolMust, StatisticalAnalysisEnum.person.getCode());
personOrgCodeBoolMust(orgCode, personBoolMust, StatisticalAnalysisEnum.person.getCode(), false);
personBoolMust.must(companyUnitTypeBoolMust);
BoolQueryBuilder inspectionCompanyBoolMust = QueryBuilders.boolQuery();
inspectionCompanyBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
personOrgCodeBoolMust(orgCode, inspectionCompanyBoolMust, StatisticalAnalysisEnum.inspectionCompany.getCode(), false);
inspectionCompanyBoolMust.must(inspectionUnitTypeBoolMust);
// inspectionCompanyBoolMust.must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*"));
inspectionCompanyBoolMust.mustNot(QueryBuilders.wildcardQuery("unitType.keyword", "*检验检测机构*"));
BoolQueryBuilder inspectionPersonBoolMust = QueryBuilders.boolQuery();
personOrgCodeBoolMust(orgCode, personBoolMust, StatisticalAnalysisEnum.person.getCode());
personOrgCodeBoolMust(orgCode, inspectionPersonBoolMust, StatisticalAnalysisEnum.inspectionPerson.getCode(), false);
inspectionPersonBoolMust.must(inspectionUnitTypeBoolMust);
// inspectionPersonBoolMust.must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*"));
inspectionPersonBoolMust.mustNot(QueryBuilders.wildcardQuery("unitType.keyword", "*检验检测机构*"));
String equipIndex = StatisticalAnalysisEnum.equip.getKey();
......@@ -4111,7 +4116,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
String filterType = "advanced";
// 组装人员过滤条件
personOrgCodeBoolMust(orgCode, boolQuery, StatisticalAnalysisEnum.person.getCode());
personOrgCodeBoolMust(orgCode, boolQuery, StatisticalAnalysisEnum.person.getCode(), true);
this.getPersonBoolQueryBuilder(filterParams, boolQuery, filterType);
// 查询
JSONObject expiryDateStatus = this.getExpiryDateStatusGroupStatistics(boolQuery);
......
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