Commit 7d6694ba authored by suhuiguang's avatar suhuiguang

feat(重要提醒):使用登记新增提醒开发

1.使用登记新增提醒开发初稿
parent c2197b6d
......@@ -193,16 +193,56 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
@Override
public MatchItemDto setMatchItem(String bizId, Map<String, Object> formData) {
// TODO bizId 为单据编号原因有的详情接口没返回
// 新增 + 编辑的保存并提交使用
MatchItemDto matchItemDto = MatchItemDto.builder().build();
matchItemDto.setIsRegister(true);
JSONObject data;
// 新增 + 编辑的保存使用
// 台套设备
// 气瓶
// 压力管道
return null;
if (formData.containsKey(notice)) { // 新增工作台发起
data = JSONObject.parseObject(JSONObject.toJSONString(formData));
} else { // 编辑
data = new JSONObject(formData);
}
String manageType = data.getString("manageType");
if (StringUtils.isNotEmpty(manageType) && "unit".equals(manageType)) { // 单位办理方式
String equListCode = data.getString("EQU_LIST_CODE");
// 气瓶--气瓶分页
if (CylinderTypeEnum.CYLINDER.getCode().equals(formData.get("EQU_CATEGORY_CODE"))) {
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) data.get("equipmentLists");
List<String> records = equipmentLists.stream().map(item -> item.get("record").toString()).collect(Collectors.toList());
String record = records.iterator().next();
setMatchItemEquCategoryByRecord(matchItemDto, record);
matchItemDto.setRegType(data.getString("regType"));
}
// 压力管道--装置
if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
String projectContraptionId = data.getString("projectContraptionId");
IdxBizJgProjectContraption projectContraption = useRegisterReminderParse.getIdxBizJgProjectContraptionServiceImpl().getById(projectContraptionId);
matchItemDto.setEquList(projectContraption.getEquList());
matchItemDto.setEquCategory(projectContraption.getEquCategory());
matchItemDto.setEquDefine(projectContraption.getEquDefine());
matchItemDto.setRegType(data.getString("regType"));
}
} else { // 台套方式
String record = data.getString("equipId");
setMatchItemEquCategoryByRecord(matchItemDto, record);
matchItemDto.setRegType(data.getString("regType"));
}
return matchItemDto;
}
private void setMatchItemEquCategoryByRecord(MatchItemDto matchItemDto, String record) {
IdxBizJgRegisterInfo registerInfo = useRegisterReminderParse.getIdxBizJgRegisterInfoMapper().selectOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record)
.select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getEquList, IdxBizJgRegisterInfo::getEquCategory, IdxBizJgRegisterInfo::getEquDefine));
matchItemDto.setEquList(registerInfo.getEquList());
matchItemDto.setEquCategory(registerInfo.getEquCategory());
matchItemDto.setEquDefine(registerInfo.getEquDefine());
}
@Override
public MatchItemDto setMatchItem(String bizId) {
// 评分 + 详情使用
// 评分 + 详情(通过按钮)使用
JgUseRegistration useRegistration = useRegisterReminderParse.getJgUseRegistrationMapper().selectById(bizId);
MatchItemDto matchItemDto = MatchItemDto.builder().build();
matchItemDto.setRegType(StringUtils.isEmpty(useRegistration.getRegType()) ? "0" : useRegistration.getRegType());
......@@ -231,11 +271,7 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
lambda.select(JgUseRegistrationEq::getEquId);
List<JgUseRegistrationEq> eqList = useRegisterReminderParse.getJgRelationEquipMapper().selectList(lambda);
String record = eqList.iterator().next().getEquId();
IdxBizJgRegisterInfo registerInfo = useRegisterReminderParse.getIdxBizJgRegisterInfoMapper().selectOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record)
.select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getEquList, IdxBizJgRegisterInfo::getEquCategory, IdxBizJgRegisterInfo::getEquDefine));
matchItemDto.setEquList(registerInfo.getEquList());
matchItemDto.setEquCategory(registerInfo.getEquCategory());
matchItemDto.setEquDefine(registerInfo.getEquDefine());
setMatchItemEquCategoryByRecord(matchItemDto, record);
}
@Override
......
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