Skip to content

A
amos-boot-biz
Commit 62b58572 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_bugfix' into develop_tzs_register

parents 3db7404c cccb7be9
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 59 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractEqMapper.java
View file @ 62b58572
......@@ -14,6 +14,4 @@ import java.util.List;
public interface JgMaintenanceContractEqMapper extends CustomBaseMapper<JgMaintenanceContractEq> {
Boolean deleteForBatch(@Param("ids") List<Long> ids);
void updateIdxBizJgRegisterInfo(@Param("list") List<String> list);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractEqMapper.xml
View file @ 62b58572
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper">
<update id="updateIdxBizJgRegisterInfo">
UPDATE idx_biz_jg_maintenance_record_info
SET
"ME_UNIT_NAME" = NULL,
"ME_UNIT_CREDIT_CODE" = NULL,
"ME_MASTER" = NULL,
"ME_MASTER_PHONE" = NULL,
"ME_MASTER_ID" = NULL,
"ME_MASTER1" = NULL,
"ME_MASTER1_PHONE" = NULL,
"ME_MASTER1_ID" = NULL,
"INFORM_START" = NULL,
"INFORM_END" = NULL,
"REPAIR_INFORM" = NULL
WHERE
RECORD IN
<foreach collection="list" item="id" index="index" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<delete id="deleteForBatch">
UPDATE amos_tzs_biz.tzs_jg_maintenance_contract_eq tjmce
set tjmce.is_delete = 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 62b58572
......@@ -188,8 +188,8 @@
</if>
<if test="dto.dataType == 'supervision' ">
AND (receive_company_code = #{dto.receiveCompanyCode}
OR transfer_to_user_ids LIKE concat ('%',#{dto.currentUserId}, '%'))
OR supervision_org_code LIKE concat (#{dto.supervisionOrgCode}, '%')
OR transfer_to_user_ids LIKE concat ('%',#{dto.currentUserId}, '%')
OR supervision_org_code LIKE concat (#{dto.supervisionOrgCode}, '%'))
AND status <![CDATA[<>]]> '使用单位待提交'
</if>
<if test="dto.dataType == 'company' ">
......
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 @ 62b58572
......@@ -1040,7 +1040,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// ]
boolean isYmtData = !String.valueOf(useInfoMap.get(DATA_SOURCE)).startsWith("jg");
if (isYmtData) {
useInfoMap.remove(DATA_SOURCE);
useInfoMap.put(DATA_SOURCE, "jg_his_ymt");// 将原先未处理为ymt的设备来源修复为jg_his_ymt
}
}
if (!useInfoMap.isEmpty()) {
......@@ -1980,7 +1980,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
BoolQueryBuilder hisBuilder = QueryBuilders.boolQuery();
hisBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
hisBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_ymt"));// 排除一码通设备
hisBuilder.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
hisBuilder.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
dBuilder.should(hisBuilder);
// 或新设备
BoolQueryBuilder jgBuilder = QueryBuilders.boolQuery();
......@@ -2022,8 +2022,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 注意：上面条件是过滤出【未做过】某个业务的设备，下面部分是过滤出【做过】某个业务的设备
// 查询 已经做过【使用登记】 的设备 【(EQU_STATUS != 空 ) && (USE_ORG_CODE（使用登记证编号） != 空)】
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"))
.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
boolMust.must(syBuilder);
} else if (ValidationUtil.equals(queryType, "GZ_GZ") || ValidationUtil.equals(queryType, "GZ_WX") || ValidationUtil.equals(queryType, "GZ_YZ")) {
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
......@@ -2824,8 +2824,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
}
}
// 删除使用信息中的省、市、区下滑线数据，来源详情的getEquipInfoMap的放入
this.removeDescAfterCode(useInfo);
// 使用信息
useInfo.setRecord(record);
useInfo.setRecDate(date);
......@@ -3082,6 +3082,26 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
return record;
}
/**
* province、city、county
* 删除由于详情返回拼接的code_name起重的_name,只保留code，否则回导致数据被保存为610423_泾阳县这样结构
* @param useInfo 使用信息
*/
private void removeDescAfterCode(IdxBizJgUseInfo useInfo) {
if(useInfo.getProvince() != null && useInfo.getProvince().contains("_")){
String[] str = useInfo.getProvince().split("_");
useInfo.setProvince(str[0]);
}
if(useInfo.getCity() != null && useInfo.getCity().contains("_")){
String[] str = useInfo.getCity().split("_");
useInfo.setCity(str[0]);
}
if(useInfo.getCounty() != null && useInfo.getCounty().contains("_")){
String[] str = useInfo.getCounty().split("_");
useInfo.setCounty(str[0]);
}
}
private String getDataSource(String operateType, LinkedHashMap equipmentInfoForm) {
// 数据来源 历史数据his 新数据new
String equipSource = String.valueOf(equipmentInfoForm.get(DATA_SOURCE));
......
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
View file @ 62b58572
......@@ -83,10 +83,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
RestHighLevelClient restHighLevelClient;
@Autowired
RedisUtils redisUtils;
@Autowired
ICmWorkflowService workflowService;
@Autowired
CommonServiceImpl commonService;
......@@ -111,9 +107,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
@Autowired
private ICmWorkflowService iCmWorkflowService;
@Autowired
IIdxBizJgUseInfoService useInfoService;
@Autowired
EventPublisher eventPublisher;
/**
......@@ -724,6 +717,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
// 记录创建业务的id，在维保备案作废时，将对应的维保记录删除
info.setSourceId(id + "");
maintenanceRecordInfoList.add(info);
});
......@@ -896,27 +891,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
queryWrapper.eq(JgMaintenanceContractEq::getEquipTransferId, maintenanceContract.getSequenceNbr());
List<JgMaintenanceContractEq> equipmentLists = maintenanceContractEqMapper.selectList(queryWrapper);
if (!CollectionUtils.isEmpty(equipmentLists)) {
List<String> list = equipmentLists.stream().filter(t -> t.getEquId() != null).map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList());
maintenanceContractEqMapper.updateIdxBizJgRegisterInfo(list);
// 删除在审批完成时写入的设备维保记录
idxBizJgMaintenanceRecordInfoService.remove(new LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq(IdxBizJgMaintenanceRecordInfo::getSourceId, maintenanceContract.getSequenceNbr()));
// 删除批量业务ID信息
List<String> equipTransferIds = equipmentLists.stream()
.map(JgMaintenanceContractEq::getEquipTransferId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (!equipTransferIds.isEmpty()) {
jgResumeInfoService.deleteBatchByBusinessId(equipTransferIds);
}
List<String> equipTransferIds = Collections.singletonList(maintenanceContract.getSequenceNbr().toString());
jgResumeInfoService.deleteBatchByBusinessId(equipTransferIds);
jgResumeInfoService.deleteBatchByBusinessId(equipmentLists.stream().filter(t -> t.getEquipTransferId() != null).map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList()));
}
}
// private void delRepeatUseEquipData(JgMaintenanceContract maintenanceContract) {
// LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(JgMaintenanceContractEq::getEquipTransferId, maintenanceContract.getSequenceNbr());
// List<JgMaintenanceContractEq> maintenanceContractEq = maintenanceContractEqMapper.selectList(queryWrapper);
// for (JgMaintenanceContractEq jgMaintenanceContractEq : maintenanceContractEq) {
// EquipUsedCheckStrategyContext.getUsedStrategy("maintenanceContract").delDataForCheckEquipRepeatUsed(Collections.singletonList(jgMaintenanceContractEq.getEquId()), maintenanceContract.getReceiveOrgCode());
// }
// }
private void finishedTask(JgMaintenanceContract maintenanceContract) {
HashMap<String, Object> taskMap = new HashMap<>();
......
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/JgScrapCancelServiceImpl.java
View file @ 62b58572
......@@ -689,10 +689,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
taskV2Model.setFlowStatus(this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
taskV2Model.setFlowStatusLabel(jgScrapCancelDto.getAuditStatus());
taskV2Model.setTaskType(businessTypeJudgment(jgScrapCancelDto.getCancelType()).getCode());
// taskV2Model.setStartUser(jgScrapCancelDto.getRecUserName());
taskV2Model.setTaskTypeLabel(businessTypeJudgment(jgScrapCancelDto.getCancelType()).getName());
taskV2Model.setStartDate(jgScrapCancelDto.getCreateDate());
taskV2Model.setStartUserId(jgScrapCancelDto.getCreateUserId());
taskV2Model.setStartUserCompanyName(jgScrapCancelDto.getUseUnitName());
taskV2Model.setExecuteUserIds(nextUserIds);
taskV2Model.setFlowCode(jgScrapCancelDto.getNextTaskId());
......
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 @ 62b58572
......@@ -834,7 +834,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this.updateUseRegUnitData(useRegistration.getSequenceNbr(), "0", workflowResultDto, true, null));
} else {
// 执行流程
flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")), null);
flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")), map);
}
} else {
String equType = this.baseMapper.getEquType(String.valueOf(map.get("EQU_LIST_CODE")));
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java
View file @ 62b58572
......@@ -146,4 +146,10 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
@TableField(exist = false)
private String supervisoryCode;
/**
* 原始业务id(如维保备案id)
*/
@TableField("\"SOURCE_ID\"")
private String sourceId;
}
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