Commit e099659a authored by caotao's avatar caotao

改造变更登记更换设备后保存,数据未更新成功问题修改。

parent 288eb62d
......@@ -14,4 +14,7 @@ import org.apache.ibatis.annotations.Select;
public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHistory> {
@Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
@Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId}")
Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
}
......@@ -52,6 +52,8 @@ import java.util.stream.Collectors;
*/
@Service
public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
private final static String bussinessType= "改造登记";
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
......@@ -166,7 +168,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
//使用登记编号
jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
//登记类别
jgRegistrationHistory.setRegistrationClass("改造登记");
jgRegistrationHistory.setRegistrationClass(bussinessType);
//设备id
jgRegistrationHistory.setEquId(equipId);
//修改数据
......@@ -188,7 +190,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
this.getBaseMapper().updateById(jgChangeRegistrationReform);
jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(bussinessType, String.valueOf(map.get("applyNo"))));
jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
} else {
//暂存处理
......@@ -442,7 +444,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
.eq("equ_id", equipId)
.eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
.eq("registration_class", "改造登记"));
.eq("registration_class", bussinessType));
originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
detail.putAll(originalData);
}
......@@ -487,7 +489,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
.eq("equ_id", equipId)
.eq("current_document_id", applyNo)
.eq("registration_class", "改造登记"));
.eq("registration_class", bussinessType));
if (!ObjectUtils.isEmpty(idxBizJgTechParamsElevator) && !ObjectUtils.isEmpty(jgRegistrationHistory)) {
//历史数据
......
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