Commit 6df0579d authored by tianyiming's avatar tianyiming

启用停用暂存修改

parent 2e776143
...@@ -219,7 +219,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto, ...@@ -219,7 +219,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
//申请单号 //申请单号
dto.setTaskCode(jgEnableDisable.getApplyNo()); dto.setTaskCode(jgEnableDisable.getApplyNo());
//业务类型枚举code值 //业务类型枚举code值
dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode()); dto.setTaskType(BusinessTypeEnum.JG_EQUIPMENT_START.getCode());
////业务主键 ////业务主键
dto.setRelationId(jgEnableDisable.getSequenceNbr() + ""); dto.setRelationId(jgEnableDisable.getSequenceNbr() + "");
modelDtos.add(dto); modelDtos.add(dto);
...@@ -562,6 +562,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto, ...@@ -562,6 +562,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
public Map<String, Object> getDetail(Long sequenceNbr) { public Map<String, Object> getDetail(Long sequenceNbr) {
Map<String,Object> resultMap = this.baseMapper.getDetail(sequenceNbr); Map<String,Object> resultMap = this.baseMapper.getDetail(sequenceNbr);
JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr)); JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
if(!ObjectUtils.isEmpty(jgEnableDisableEq)){
Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId()); Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
map.put("equListDesc",map.get("equList")); map.put("equListDesc",map.get("equList"));
map.put("equCategoryDesc",map.get("equCategory")); map.put("equCategoryDesc",map.get("equCategory"));
...@@ -573,6 +574,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto, ...@@ -573,6 +574,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
map.put(s, JSON.parseArray(map.get(s).toString())); map.put(s, JSON.parseArray(map.get(s).toString()));
} }
resultMap.putAll(map); resultMap.putAll(map);
}
return resultMap; return resultMap;
} }
......
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