Commit 114400e2 authored by caotao's avatar caotao

新增根据设备id与文档id作废其余数据方法

parent f0c7e8a4
...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper; ...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
/** /**
* 改造变更登记设备关系表 Mapper 接口 * 改造变更登记设备关系表 Mapper 接口
...@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2023-12-20 * @date 2023-12-20
*/ */
public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> { public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
@Update("update jg_change_registration_reform set is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
} }
...@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto; ...@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform; import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper; ...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
/** /**
* 移装变更登记设备关系表 Mapper 接口 * 移装变更登记设备关系表 Mapper 接口
...@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2023-12-20 * @date 2023-12-20
*/ */
public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> { public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> {
@Update("update tzs_jg_change_registration_transfer_eq set is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId,@Param("currentDocumentId") String currentDocumentId);
} }
...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper; ...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
/** /**
* 使用登记设备关系表 Mapper 接口 * 使用登记设备关系表 Mapper 接口
...@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2023-12-18 * @date 2023-12-18
*/ */
public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> { public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> {
@Update("update tzs_jg_use_registration_eq set is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
} }
...@@ -10,11 +10,11 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams; ...@@ -10,11 +10,11 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform; import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum; import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService; import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
...@@ -60,6 +60,17 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -60,6 +60,17 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
private OtherInfoMapper otherInfoMapper; private OtherInfoMapper otherInfoMapper;
@Autowired @Autowired
private JgChangeRegistrationReformMapper jgChangeRegistrationReformMapper; private JgChangeRegistrationReformMapper jgChangeRegistrationReformMapper;
//改造登记关系表mapper
@Autowired
private JgChangeRegistrationReformEqMapper jgChangeRegistrationReformEqMapper;
//移装登记关系表
@Autowired
private JgChangeRegistrationTransferEqMapper jgChangeRegistrationTransferEqMapper;
//使用登记关系表mapper
@Autowired
private JgUseRegistrationEqMapper jgUseRegistrationEqMapper;
@Autowired @Autowired
WorkFlowFeignService workFlowFeginService; WorkFlowFeignService workFlowFeginService;
@Autowired @Autowired
...@@ -112,16 +123,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -112,16 +123,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
} else { } else {
// 业务管理设备信息保存 // 业务管理设备信息保存
JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq(); JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
jgRelationEquip.setEquId(map.get("equipId").toString()); jgChangeRegistrationReformEq.setEquId(map.get("equipId").toString());
// jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode())); // jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1); List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0)); jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
jgChangeRegistrationReform.setAuditStatus("待提交"); jgChangeRegistrationReform.setAuditStatus("待提交");
jgChangeRegistrationReform.setStatus(UseStatusEnum.SUBMIT.getPass()); jgChangeRegistrationReform.setStatus(UseStatusEnum.SUBMIT.getPass());
this.save(jgChangeRegistrationReform); this.save(jgChangeRegistrationReform);
jgRelationEquip.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString()); jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
jgChangeRegistrationReformMapper.insert(jgChangeRegistrationReform); jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
} }
if (!ObjectUtils.isEmpty(map.get("submit"))) { if (!ObjectUtils.isEmpty(map.get("submit"))) {
...@@ -212,8 +223,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -212,8 +223,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
lambda.eq(JgChangeRegistrationReform::getSequenceNbr, id); lambda.eq(JgChangeRegistrationReform::getSequenceNbr, id);
JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(lambda); JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(lambda);
if ("流程结束".equals(taskName)) { if ("流程结束".equals(taskName)) {
JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id",jgChangeRegistrationReform.getSequenceNbr()));
jgChangeRegistrationReform.setStatus(taskName); jgChangeRegistrationReform.setStatus(taskName);
jgChangeRegistrationReform.setAuditStatus("已完成"); jgChangeRegistrationReform.setAuditStatus("已完成");
makeEquipmentsInvalid(jgChangeRegistrationReformEq.getEquId(),jgChangeRegistrationReform.getSequenceNbr().toString());
} else { } else {
jgChangeRegistrationReform.setNextExecuteIds(role); jgChangeRegistrationReform.setNextExecuteIds(role);
jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId()); jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
...@@ -288,4 +301,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -288,4 +301,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport")))); detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
return detail; return detail;
} }
/**
* 批量设置设备无效(使用登记、移装登记、改造登记)
* @param equipmentId 装备id
* @param currentDocumentId 当前文档id
*/
public void makeEquipmentsInvalid(String equipmentId,String currentDocumentId){
jgChangeRegistrationReformEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId,currentDocumentId);
jgChangeRegistrationTransferEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId,currentDocumentId);
jgUseRegistrationEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId,currentDocumentId);
}
} }
\ No newline at end of file
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