Skip to content

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

fix:(jg):气瓶单位变更功能开发

parent aebb3573
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 65 deletions
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 7fd03c9c
......@@ -3077,7 +3077,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
List<IdxBizJgUseInfo> useInfoListByEquIds = idxBizJgUseInfoService.getUseInfoListByEquIds(equIds);
Map<String, String> equAddressMap = new HashMap<>();
if (!ValidationUtil.isEmpty(useInfoListByEquIds)) {
equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(IdxBizJgUseInfo::getRecord,
equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(
IdxBizJgUseInfo::getRecord,
useInfo -> {
String fulladdress = "";
if (!ValidationUtil.isEmpty(useInfo.getProvinceName())) {
......@@ -3096,8 +3097,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
fulladdress += useInfo.getAddress();
}
return fulladdress;
}
)
},
(v1, v2) -> v1)
);
}
......@@ -4099,7 +4100,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, recordList);
result.getRecords().forEach(i -> {
i.put("chargingMedium", Optional.ofNullable(fillingMediumMap.get(i.get("chargingMedium"))).orElse(""));
i.put("chargingMedium", MapUtil.getStr(fillingMediumMap, "chargingMedium", ""));
i.put("sequenceNbr", MapUtil.getStr(i, "record"));
i.put("productPhoto", JSONArray.parseArray(i.getString("productPhoto")));
i.put("cylinderStampAttachment", JSONArray.parseArray(i.getString("cylinderStampAttachment")));
i.put("informationSituation",InformationManageTypeEnum.getName(i.getString("informationSituation")));
......
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 @ 7fd03c9c
......@@ -54,6 +54,7 @@ import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
......@@ -89,6 +90,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
private static final String PROCESS_DEFINITION_KEY = "unitChange";
private static final String TABLE_PAGE_ID = "1734141426742095873";
private static final String RECORD = "record";
private static final String SEQUENCE_NBR = "sequenceNbr";
private static final String EQU_CODE_CC = "5000";
private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
......@@ -346,7 +348,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeDto.getEquListCode())) {
dealProjectContraptionToUpdate(submitType, noticeDto, op, reginParams);
} else if (CylinderTypeEnum.CYLINDER.getCode().equals(noticeDto.getEquCategoryCode())) {
return this.dealCylinderToUpdate(submitType, noticeDto, "", reginParams);
return this.dealCylinderToUpdate(submitType, noticeDto, op, reginParams);
} else {
// 字段转换
this.convertField(noticeDto);
......@@ -356,9 +358,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
throw new BadRequest("使用登记证不能为空");
}
//根据使用登记证查询设备
List<Long> registrationIdList = registrationList.stream().filter(v -> v.containsKey("sequenceNbr") &&
ObjectUtils.isNotEmpty(v.get("sequenceNbr")) && canConvertToLong(v.get("sequenceNbr").toString()))
.map(v -> Long.parseLong(v.get("sequenceNbr").toString())).collect(Collectors.toList());
List<Long> registrationIdList = registrationList.stream().filter(v -> v.containsKey(SEQUENCE_NBR) &&
ObjectUtils.isNotEmpty(v.get(SEQUENCE_NBR)) && canConvertToLong(v.get(SEQUENCE_NBR).toString()))
.map(v -> Long.parseLong(v.get(SEQUENCE_NBR).toString())).collect(Collectors.toList());
// 获取单位变更设备列表
if (CollectionUtils.isEmpty(registrationIdList)) {
throw new BadRequest("使用登记证不能为空");
......@@ -540,13 +542,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (CollectionUtils.isEmpty(deviceList)) {
throw new BadRequest("请选择设备后提交");
}
// 获取单位变更单号
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), 1);
List<String> applyNoList = listResponseModel.getResult();
if (CollectionUtils.isEmpty(applyNoList)) {
log.error("生成申请变更单位编码失败");
throw new BadRequest("生成申请变更单位编码失败");
}
String applyNo = changeRegistrationUnitDto.getApplyNo();
List<String> applyNoList = ValidationUtil.isEmpty(applyNo)
? Optional.ofNullable(tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), 1))
.filter(r -> r.getStatus() == HttpStatus.OK.value() && !CollectionUtils.isEmpty(r.getResult()))
.map(ResponseModel::getResult)
.orElseThrow(() -> new BadRequest("生成申请变更单位编码失败！"))
: Collections.singletonList(applyNo);
if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
//如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
CompanyBo company = reginParams.getCompany();
......@@ -718,7 +721,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
for (Map<String, Object> objectMap : projectContraptionList) {
if (objectMap.containsKey("useRegistrationCode") && ObjectUtils.isNotEmpty(objectMap.get("useRegistrationCode"))) {
registrationNoList.add(objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(), objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get(SEQUENCE_NBR).toString(), objectMap.get("useRegistrationCode").toString());
}
}
//查询装置下的管道信息
......@@ -1014,9 +1017,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
List<Long> registrationIdList = new ArrayList<>();//使用登记证id
List<String> registrationNoList = new ArrayList<>();//使用登记证编号
for (Map<String, Object> objectMap : registrationList) {
if (objectMap.containsKey("sequenceNbr") && ObjectUtils.isNotEmpty(objectMap.get("sequenceNbr"))
&& canConvertToLong(objectMap.get("sequenceNbr").toString())) {
registrationIdList.add(Long.parseLong(objectMap.get("sequenceNbr").toString()));
if (objectMap.containsKey(SEQUENCE_NBR) && ObjectUtils.isNotEmpty(objectMap.get(SEQUENCE_NBR))
&& canConvertToLong(objectMap.get(SEQUENCE_NBR).toString())) {
registrationIdList.add(Long.parseLong(objectMap.get(SEQUENCE_NBR).toString()));
}
if (objectMap.containsKey("useRegistrationCode") && ObjectUtils.isNotEmpty(objectMap.get("useRegistrationCode"))) {
registrationNoList.add(objectMap.get("useRegistrationCode").toString());
......@@ -1607,7 +1610,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
// 更新历史表中一二级审批车牌号
history.setChangeData(JSONObject.toJSONString(dto.getRegistrationList()));
registrationHistoryService.updateById(history);
List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString(SEQUENCE_NBR)).collect(Collectors.toList());
List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
// 用来存放新生成的登记证
List<JgUseRegistrationManage> newList = new ArrayList<>();
......@@ -1749,10 +1752,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
registration.setNextTaskId(nextTaskId);
TaskV2Model taskV2Model = updateTaskModel(registration, op);
AtomicReference<Boolean> flag = new AtomicReference<>(Boolean.FALSE);
String useRegistrationCode = null;
String useRegistrationCode;
JgUseRegistrationManageDto manageDto = new JgUseRegistrationManageDto();
manageDto.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
manageDto.setUseUnitCreditCode(dto.getNewUseUnitCreditCode());
manageDto.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
manageDto.setRegType("0");
useRegistrationCode = Optional.ofNullable(jgUseRegistrationManageMapper.queryByUseUnitCreditCode(manageDto))
.filter(list -> !list.isEmpty())
......@@ -1765,55 +1768,65 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
return code;
}).orElse(commonServiceImpl.generateRegistrationCode(Objects.toString(deviceList.get(0).get(RECORD)), dto.getReceiveCompanyCode(), true));
List<String> equIds = new ArrayList<>();
List<String> records = new ArrayList<>();
Map<String, Map<String, Object>> resultMap = new HashMap<>();
TzBaseEnterpriseInfo enterpriseInfo = Optional.ofNullable(dto.getEstateUnitSeq())
.filter(ObjectUtils::isNotEmpty)
.map(tzBaseEnterpriseInfoMapper::selectById)
.orElse(null);
for (Map<String, Object> map : deviceList) {
String equId = MapUtils.getString(map, "equId");
equIds.add(equId);
//更新产权单位信息
String estateUnitSeq = Objects.toString(map.get("estateUnitSeq"),"");
String safetyManager = Objects.toString(map.get("safetyManagerName"),"");
String phone = Objects.toString(map.get("phone"),"");
String useDate = Objects.toString(map.get("useDate"),"");
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty()) ?
tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq) : null;
String record = MapUtils.getString(map, RECORD);
records.add(record);
LambdaQueryWrapper<IdxBizJgUseInfo> useInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
useInfoLambdaQueryWrapper.eq(IdxBizJgUseInfo::getRecord, equId);
useInfoLambdaQueryWrapper.eq(IdxBizJgUseInfo::getRecord, record);
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
//更新产权信息
if (enterpriseInfo != null) {
if (ObjectUtils.isNotEmpty(useInfo)) {
if (enterpriseInfo != null) {
useInfo.setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode()).setEstateUnitName(enterpriseInfo.getUseUnit());
}
useInfoMapper.updateById(useInfo
.setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
.setEstateUnitName(enterpriseInfo.getUseUnit())
.setPhone(phone)
.setUseUnitCreditCode(dto.getNewUseUnitCreditCode())
.setUseUnitName(dto.getNewUseUnitName())
.setSafetyManager(safetyManager)
.setPhone(dto.getPhone())
.setUseUnitCreditCode(registration.getNewUseUnitCreditCode())
.setUseUnitName(registration.getNewUseUnitName())
.setSafetyManager(Optional.ofNullable(dto.getSafetyManager())
.map(s -> s.split(","))
.filter(arr -> arr.length > 1)
.map(arr -> arr[1])
.orElse(""))
.setProvinceName("陕西省")
.setProvince(dto.getProvince())
.setCity(dto.getCity())
.setCityName(getRegionNameByCode("city", dto.getCity()))
.setCounty(dto.getCounty())
.setCountyName(getRegionNameByCode("region", dto.getCounty()))
.setFactoryUseSiteStreet(dto.getStreet())
.setStreetName(getRegionNameByCode("street", dto.getStreet()))
.setAddress(dto.getFullAddress())
.setCity(dto.getCity())
.setCounty(dto.getCounty())
.setAddress(dto.getEquAddress())
.setFactoryUseSiteStreet(dto.getStreet())
.setUseDate(useDate));
}
.setUseDate(dto.getUseDate()));
}
//更新属地信息
IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
if (map.containsKey("orgBranchCode") && !org.springframework.util.ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
String[] data = String.valueOf(map.get("orgBranchCode")).split("_");
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(data[0]).getResult();
if (!ObjectUtils.isEmpty(dto.getOrgBranchCode())) {
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(registration.getOrgBranchCode()).getResult();
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
idxBizJgSupervisionInfo.setOrgBranchCode(data[0]);
idxBizJgSupervisionInfo.setOrgBranchName(data[1]);
idxBizJgSupervisionInfo.setOrgBranchCode(registration.getOrgBranchCode());
idxBizJgSupervisionInfo.setOrgBranchName(registration.getOrgBranchName());
idxBizJgSupervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda()
.eq(IdxBizJgSupervisionInfo::getRecord, map.get("equipId"));
.eq(IdxBizJgSupervisionInfo::getRecord, record);
idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
}
//更新注册信息
LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
lambda.eq(IdxBizJgRegisterInfo::getRecord, equId);
lambda.eq(IdxBizJgRegisterInfo::getRecord, record);
lambda.set(true, IdxBizJgRegisterInfo::getUseOrgCode, useRegistrationCode);
idxBizJgRegisterInfoService.update(lambda);
......@@ -1826,7 +1839,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
esUpdateParams.put("ORG_BRANCH_CODE", registration.getOrgBranchCode());
esUpdateParams.put("ORG_BRANCH_NAME", registration.getOrgBranchName());
esUpdateParams.put("USE_ORG_CODE", useRegistrationCode);
resultMap.put(equId, esUpdateParams);
resultMap.put(record, esUpdateParams);
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
}
JgUseRegistrationManage registrationManage;
......@@ -1865,6 +1878,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
registrationManage.setAuditPassDate(registration.getAuditPassDate());
registrationManage.setVersion(1);
registrationManage.setRegType("0");
registrationManage.setChangeReason(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {
TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
......@@ -1880,7 +1894,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
//新增使用登记证和设备变更记录
this.saveRecord(registration);
//创建设备履历
this.createResume(equIds, registration, taskV2Model.getRoutePath());
this.createResume(records, registration, taskV2Model.getRoutePath());
JgChangeRegistrationUnitMapper.updateById(registration);
// redis流程实时数据更新
commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), this.buildInstanceRuntimeData(registration));
......@@ -1944,7 +1958,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
List<String> projectContraptionIds = new ArrayList<>();
for (Map<String, Object> map : projectContraptionList) {
String useRegistrationCode = (String) map.get("useRegistrationCode");
String sequenceNbr = (String) map.get("sequenceNbr");
String sequenceNbr = (String) map.get(SEQUENCE_NBR);
projectContraptionIds.add(sequenceNbr);
String estateUnitSeq = String.valueOf(map.get("estateUnitName"));
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
......@@ -2173,10 +2187,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
//根据使用登记证查询设备
for (Object o : registrationList) {
JSONObject parseObject = JSON.parseObject(o.toString());
if (parseObject.containsKey("sequenceNbr") && ObjectUtils.isNotEmpty(parseObject.get("sequenceNbr")) &&
canConvertToLong(parseObject.get("sequenceNbr").toString())) {
registrationIdList.add(Long.parseLong(parseObject.get("sequenceNbr").toString()));
projectContraptionIdList.add(parseObject.get("sequenceNbr").toString());
if (parseObject.containsKey(SEQUENCE_NBR) && ObjectUtils.isNotEmpty(parseObject.get(SEQUENCE_NBR))) {
registrationIdList.add(MapUtils.getLongValue(parseObject, SEQUENCE_NBR));
projectContraptionIdList.add(MapUtils.getString(parseObject,SEQUENCE_NBR));
}
}
if (CollectionUtils.isEmpty(registrationIdList)) {
......@@ -2522,7 +2535,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.map(JgScrapCancelEq::getEquId)
.collect(Collectors.toList());
// 查询单子下的所有使用登记证的seq
List<Long> certificateSeq = JSONArray.parseArray(JSON.toJSONString(JSONObject.parseObject(history.getChangeData()).get("certificates"))).stream().map(item -> Long.valueOf((String) JSONObject.parseObject(JSONObject.toJSONString(item)).get("sequenceNbr"))).collect(Collectors.toList());
List<Long> certificateSeq = JSONArray.parseArray(JSON.toJSONString(JSONObject.parseObject(history.getChangeData()).get("certificates"))).stream().map(item -> Long.valueOf((String) JSONObject.parseObject(JSONObject.toJSONString(item)).get(SEQUENCE_NBR))).collect(Collectors.toList());
// 使用登记证下的所有设备
List<JSONObject> equJSONList = registrationManageService.queryEquByCertificateSeqList(certificateSeq);
// 过滤出未入库的设备
......@@ -2636,7 +2649,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.collect(Collectors.toList());
// 查询单子下的所有使用登记证的seq
List<Long> certificateSeq = JSONArray.parseArray(history.getChangeData()).stream().map(item -> Long.valueOf((String) JSONObject.parseObject(JSONObject.toJSONString(item)).get("sequenceNbr"))).collect(Collectors.toList());
List<Long> certificateSeq = JSONArray.parseArray(history.getChangeData()).stream().map(item -> Long.valueOf((String) JSONObject.parseObject(JSONObject.toJSONString(item)).get(SEQUENCE_NBR))).collect(Collectors.toList());
// 使用登记证下的所有设备
List<JSONObject> equJSONList = registrationManageService.queryEquByCertificateSeqList(certificateSeq);
// 过滤出未入库的设备
......@@ -2725,7 +2738,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
for (Map<String, Object> objectMap : projectContraptionList) {
if (objectMap.containsKey("useRegistrationCode") && ObjectUtils.isNotEmpty(objectMap.get("useRegistrationCode"))) {
registrationNoList.add(objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(), objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get(SEQUENCE_NBR).toString(), objectMap.get("useRegistrationCode").toString());
}
}
//查询装置下的管道信息
......@@ -2899,7 +2912,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
*/
public List<Map<String, Object>> queryPipelineList(List<Map<String, Object>> projectContraptionList) {
List<Map<String, Object>> result = new ArrayList<>();
projectContraptionList.forEach(item -> result.addAll(projectContraptionService.getBaseMapper().selectEquipList((String) item.get("sequenceNbr"))));
projectContraptionList.forEach(item -> result.addAll(projectContraptionService.getBaseMapper().selectEquipList((String) item.get(SEQUENCE_NBR))));
return result;
}
......@@ -2942,7 +2955,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
historyJson.forEach(item -> {
JSONObject jsonObject = JSON.parseObject(item.toString());
if (sequenceNbr.equals(jsonObject.getString("sequenceNbr"))) {
if (sequenceNbr.equals(jsonObject.getString(SEQUENCE_NBR))) {
projectContraptionDetail.putAll(jsonObject);
}
});
......
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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @ 7fd03c9c
......@@ -16,10 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.*;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeVehicleRegistrationUnitService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
......@@ -824,6 +821,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
map.put("useRegistrationCode", useRegistrationCode);
JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery()
.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
.eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
.eq(JgUseRegistrationManage::getIsDelete,0)
.one();
List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr());
......
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