Skip to content

A
amos-boot-biz
Commit 8343463c authored by 刘林's avatar 刘林
Browse files
Options

fix(jg)：场车添加审批后更新ES，告知暂存功能修改

parent 7634484e
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 23 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgNoticeToBeSubmitDto.java
View file @ 8343463c
......@@ -23,6 +23,9 @@ public class JgNoticeToBeSubmitDto extends BaseDto {
@ApiModelProperty(value = "业务类型")
private String businessType;
@ApiModelProperty(value = "业务类型Code")
private String type;
@ApiModelProperty(value = "申请单号")
private String applyNo;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java
View file @ 8343463c
......@@ -510,4 +510,10 @@ public class JgInstallationNotice extends BaseEntity {
*/
@TableField("certificate_print_tag")
private String certificatePrintTag;
/**
* 是否暂存状态（0-否，1-是）
*/
@TableField("is_temporary_status")
private String isTemporaryStatus;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ 8343463c
......@@ -390,6 +390,7 @@
SELECT
isn.sequence_nbr AS sequenceNbr,
'安装告知' AS businessType,
'GZ_AZ' AS type,
isn.apply_no AS applyNo,
ec1.name AS equListName,
ec2.name AS equCategoryName,
......@@ -405,6 +406,7 @@
SELECT
isn.sequence_nbr AS sequenceNbr,
'改造告知' AS businessType,
'GZ_GZ' AS type,
isn.apply_no AS applyNo,
isn.equ_list_name AS equListName,
isn.equ_category_name AS equCategoryName,
......@@ -418,6 +420,7 @@
SELECT
isn.sequence_nbr AS sequenceNbr,
'维修告知' AS businessType,
'GZ_WX' AS type,
isn.apply_no AS applyNo,
ec1.name AS equListName,
ec2.name AS equCategoryName,
......@@ -433,6 +436,7 @@
SELECT
isn.sequence_nbr AS sequenceNbr,
'移装告知' AS businessType,
'GZ_YZ' AS type,
isn.apply_no AS applyNo,
ec1.name AS equListName,
ec2.name AS equCategoryName,
......
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/JgChangeRegistrationUnitServiceImpl.java
View file @ 8343463c
......@@ -107,6 +107,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Autowired
UseInfoMapper useInfoMapper;
@Autowired
IdxBizJgRegisterInfoMapper registerInfoMapper;
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
......@@ -1202,27 +1204,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
List<JgChangeRegistrationUnitEq> jgChangeRegistrationUnitEqs = JgChangeRegistrationUnitEqMapper.selectList(queryWrapper);
//修改ES中使用单位信息和使用单位代码
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : jgChangeRegistrationUnitEqs) {
String equipId = jgChangeRegistrationUnitEq.getEquId();
LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(UseInfo::getRecord, equipId);
UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(useInfo)) {
useInfo.setUseUnitName(registration.getNewUseUnitName());
useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
useInfoMapper.updateById(useInfo);
}
Map<String, Object> map1 = new HashMap<>();
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
map1.put("EQU_STATE", "1");
resultMap.put(equipId, map1);
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
}
//更新产权信息
dto.getRegistrationList().forEach(v -> {
String useCode = String.valueOf(v.get("useRegistrationCode"));
......@@ -1255,6 +1237,34 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
});
for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : jgChangeRegistrationUnitEqs) {
String equipId = jgChangeRegistrationUnitEq.getEquId();
LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(UseInfo::getRecord, equipId);
UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(useInfo)) {
useInfo.setUseUnitName(registration.getNewUseUnitName());
useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
useInfoMapper.updateById(useInfo);
}
LambdaQueryWrapper<IdxBizJgRegisterInfo> registerInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
registerInfoLambdaQueryWrapper.eq(IdxBizJgRegisterInfo::getRecord, equipId);
IdxBizJgRegisterInfo registerInfo = registerInfoMapper.selectOne(registerInfoLambdaQueryWrapper);
Map<String, Object> map1 = new HashMap<>();
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
map1.put("EQU_STATE", "1");
if (ObjectUtils.isNotEmpty(registerInfo) && ObjectUtils.isNotEmpty(registerInfo.getCarNumber())) {
map1.put("CAR_NUMBER", registerInfo.getCarNumber());
}
resultMap.put(equipId, map1);
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
}
registration.setNextTaskId(nextTaskId);
updateTaskModel(registration, op);
//新增使用登记证和设备变更记录
......
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/JgInstallationNoticeServiceImpl.java
View file @ 8343463c
......@@ -119,6 +119,7 @@ import static com.alibaba.fastjson.JSON.parseArray;
public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationNoticeDto, JgInstallationNotice, JgInstallationNoticeMapper> implements IJgInstallationNoticeService, ICompensateFlowDataOfRedis<JgInstallationNotice> {
private static final String SUBMIT_TYPE_FLOW = "1";
private static final String SUBMIT_TYPE_TEMP = "3";
private static final String PROCESS_DEFINITION_KEY = "installationNotificationNew";
private static final String PROCESS_INSTALL_NOTICE_KEY = "installNotice";
......@@ -875,7 +876,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 获取告知设备列表
List<Map<String, Object>> deviceList = model.getDeviceList();
// 提交时对设备状态进行校验（处理并发问题，一个未被使用的设备同时被多个使用这打开，同时提交发起申请） todo 回滚异常未写
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
if (SUBMIT_TYPE_FLOW.equals(submitType)) {//提交
if (CollectionUtils.isEmpty(deviceList)) {
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/JgUseRegistrationServiceImpl.java
View file @ 8343463c
......@@ -1927,6 +1927,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
param.put("EQU_CODE", dataMap.get("equCode"));
param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
param.put("CYLINDER_CATEGORY", dataMap.get("cylinderCategory"));
if((!ObjectUtils.isEmpty(carNumber))) {
param.put("CAR_NUMBER", dataMap.get("carNumber"));
}
objMap.put((String) dataMap.get("equipId"), param);
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
}
......@@ -2080,7 +2083,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String orgCode = "";
if (jsonObject.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(jsonObject.get("orgBranchCode"))) {
orgCode = String.valueOf(jsonObject.get("orgBranchCode")).split("_")[0];
;
}
//驳回
if ("1".equals(operate)) {
......
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