Skip to content

A
amos-boot-biz
Commit 0f439483 authored by tianbo's avatar tianbo
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_test' into develop_tzs_register

parents df482e74 cce72be8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 57 deletions
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml
View file @ 0f439483
......@@ -655,7 +655,7 @@
ui."EQU_STATE" cylinderStatus,
(select name from cb_data_dictionary where type = 'SHZT' and code = ui."EQU_STATE") cylinderStatusName,
ri."USE_ORG_CODE" useOrgCode,
ui."EQU_LIST" equList,
ri."EQU_LIST" equList,
(select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
ri."EQU_CATEGORY" equCategory,
(select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeVehicleRegistrationUnit.java
View file @ 0f439483
......@@ -251,4 +251,6 @@ public class JgChangeVehicleRegistrationUnit extends BaseEntity {
@TableField("transfer_to_user_ids")
private String transferToUserIds;
@TableField(exist = false)
private String address;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeVehicleRegistrationUnitController.java
View file @ 0f439483
......@@ -103,7 +103,20 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增、更新车用气瓶变更", notes = "新增、更新车用气瓶变更")
@FieldMapping({@FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "useUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq"),})
@FieldMapping({
@FieldMapping.FieldMap(
sourceField = "useUnitSeq",
targetField = "useUnitCreditCode",
serviceClass = CommonServiceImpl.class,
queryMethod = "queryUnitCreditInfoBySeq"),
@FieldMapping.FieldMap(
sourceField = "estateUnitSeq",
targetField = "estateUnitCreditCode",
serviceClass = CommonServiceImpl.class,
queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
secondParamValue = "CQ"
)
})
public ResponseModel<String> save(@RequestBody JSONObject model) {
ReginParams reginParams = getSelectedOrgInfo();
jgChangeVehicleRegistrationUnitServiceImpl.saveMessage(model, reginParams);
......
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/CommonServiceImpl.java
View file @ 0f439483
......@@ -2524,7 +2524,8 @@ public class CommonServiceImpl implements ICommonService {
formData.put("estatePhone", contactPhone);
}
}
formData.put("CQUnitCode", formData.getString("estateUnitName").split("_")[0]);
String cqUnitCode = formData.getString("estateUnitName").split("_")[0];
formData.put("CQUnitCode", cqUnitCode.startsWith("TCM") ? "" : cqUnitCode);
formData.put("estateUnitName", formData.getString("estateUnitName").split("_")[1]);
}
if (formData.containsKey("equList")) {
......@@ -3449,6 +3450,6 @@ public class CommonServiceImpl implements ICommonService {
commonMapper.addTcmUnitInfo(propertyUnitInfo);
}
return propertyUnitInfo;
return !ValidationUtil.isEmpty(propertyUnitInfo) ? propertyUnitInfo : Maps.newHashMap();
}
}
\ No newline at end of file
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 @ 0f439483
......@@ -1961,18 +1961,28 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
// 使用登记
// Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
.select(JgUseRegistrationManage::getReceiveOrgName, JgUseRegistrationManage::getReceiveCompanyCode)
// 查询使用登记
StringBuilder businessBuilder = new StringBuilder(business);
if (!ObjectUtils.isEmpty(useRegistrationCode)) {
List<JgUseRegistrationManage> regs = jgUseRegistrationManageService.lambdaQuery()
.select(JgUseRegistrationManage::getReceiveOrgName,
JgUseRegistrationManage::getReceiveCompanyCode)
.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
.eq(JgUseRegistrationManage::getIsDelete, false)
.eq(JgUseRegistrationManage::getCertificateStatus, YIDENGJI.getName())
.one();
if (!ObjectUtils.isEmpty(jgUseRegistrationManage)) {
business = business + ",使用登记";
// objMap.putAll(useRegistrationDetail);
.list();
if (regs.size() > 1) {
throw new BadRequest("使用登记重复"+ useRegistrationCode);
}
if (!regs.isEmpty()) {
JgUseRegistrationManage jgUseRegistrationManage = regs.get(0);
businessBuilder.append(",使用登记");
objMap.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
}
return business;
}
return businessBuilder.toString();
}
/**
......
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 @ 0f439483
......@@ -18,7 +18,6 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.enums.TcmUnitTypeEnum;
import com.yeejoin.amos.boot.biz.common.enums.TcmUnitTypeEnum;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -1869,21 +1868,19 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
String useCode = String.valueOf(v.get("useRegistrationCode"));
String newCarNumber = String.valueOf(v.get("newCarNumber"));
String estateUnitSeq = String.valueOf(v.get("estateUnitName"));
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
? tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq)
: null;
Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
List<String> records = idxBizJgRegisterInfoService.getBaseMapper()
.selectList(new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.eq(IdxBizJgRegisterInfo::getUseOrgCode, useCode))
.stream()
.map(IdxBizJgRegisterInfo::getRecord)
.collect(Collectors.toList());
if (!records.isEmpty() && enterpriseInfo != null) {
if (!records.isEmpty()) {
idxBizJgUseInfoService.update(
new IdxBizJgUseInfo()
.setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
.setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"))
.setEquState(EquimentEnum.ZAIYONG.getCode().toString())
.setEstateUnitName(enterpriseInfo.getUseUnit()),
.setEstateUnitName(propertyUnitInfo.get("unitName")),
new LambdaQueryWrapper<IdxBizJgUseInfo>()
.in(IdxBizJgUseInfo::getRecord, records)
);
......@@ -2113,10 +2110,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
Map<String, Map<String, Object>> esUpdateMap = new HashMap<>();
// 4. 更新产权单位信息
TzBaseEnterpriseInfo enterpriseInfo = Optional.ofNullable(dto.getEstateUnitSeq())
.filter(ObjectUtils::isNotEmpty)
.map(tzBaseEnterpriseInfoMapper::selectById)
.orElse(null);
Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(dto.getEstateUnitSeq(), TcmUnitTypeEnum.CQ.getCode());
// 提取设备信息（只取第一个）
if (CollUtil.isNotEmpty(deviceList)) {
Map<String, Object> first = deviceList.get(0);
......@@ -2130,7 +2124,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
records.add(record);
IdxBizJgUseInfo useInfo = fetchUseInfoByRecord(record);
if (useInfo != null) {
updateUseInfoFields(useInfo, dto, registration, enterpriseInfo);
updateUseInfoFields(useInfo, dto, registration, propertyUnitInfo);
useInfoMapper.updateById(useInfo);
}
......@@ -2197,10 +2191,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
private void updateUseInfoFields(IdxBizJgUseInfo useInfo, JgChangeRegistrationUnitDto dto, JgChangeRegistrationUnit registration,
TzBaseEnterpriseInfo enterpriseInfo) {
if (enterpriseInfo != null) {
useInfo.setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
.setEstateUnitName(enterpriseInfo.getUseUnit());
Map<String, String> propertyUnitInfo) {
if (!ValidationUtil.isEmpty(propertyUnitInfo)) {
useInfo.setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"))
.setEstateUnitName(propertyUnitInfo.get("unitName"));
}
String safetyManager = Optional.ofNullable(registration.getSafetyManager())
......@@ -2386,9 +2380,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
String sequenceNbr = (String) map.get(SEQUENCE_NBR);
projectContraptionIds.add(sequenceNbr);
String estateUnitSeq = String.valueOf(map.get("estateUnitName"));
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
? tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq)
: null;
Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
.isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode)
......@@ -2398,10 +2390,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
throw new BadRequest("使用登记证编号：" + useRegistrationCode + "对应的工程/装置列表不存在");
}
//更新产权信息
if (enterpriseInfo != null) {
if (!ValidationUtil.isEmpty(propertyUnitInfo)) {
idxBizJgUseInfoService.update(
new IdxBizJgUseInfo().setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
.setEstateUnitName(enterpriseInfo.getUseUnit()),
new IdxBizJgUseInfo().setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"))
.setEstateUnitName(propertyUnitInfo.get("unitName")),
new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr)
);
}
......
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/JgEquipTransferServiceImpl.java
View file @ 0f439483
......@@ -502,7 +502,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
* @param op 通过或驳回
*/
@Transactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
public void accept(JgEquipTransferDto jgEquipTransferDto, String op) {
String instanceId = jgEquipTransferDto.getInstanceId();
String nextTaskId = jgEquipTransferDto.getNextTaskId();
......
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/JgUseRegistrationManageServiceImpl.java
View file @ 0f439483
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.enums.TcmUnitTypeEnum;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -1042,6 +1044,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
.map(value -> value == null ? "" : value)
.collect(Collectors.joining())
);
// 兼容历史数据，根据产权单位Seq（item.getEstateUnitName()）从tzs_tcm_unit_info表查询产权单位
if (!ValidationUtil.isEmpty(item.getEstateUnitName())) {
Map<String, String> propertyUnitInfo = commonService.queryTcmUnitInfoBySeq(item.getEstateUnitName(), TcmUnitTypeEnum.CQ.getCode());
item.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "sequenceNbr"));
}
});
}
return projectContraptionPage;
......
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/JgUseRegistrationServiceImpl.java
View file @ 0f439483
......@@ -16,7 +16,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
......@@ -451,10 +450,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, map.get("equipId"));
// 产权单位信息
if (map.containsKey("estateUnitName")) {
String[] data = String.valueOf(map.getString("estateUnitName")).split("_");
useInfo.setEstateUnitCreditCode(data[0]);
useInfo.setEstateUnitName(data[1]);
if (!ValidationUtil.isEmpty(map.getString("estateUnitSeq"))) {
String estateUnitSeq = String.valueOf(map.getString("estateUnitSeq"));
Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
useInfo.setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"));
useInfo.setEstateUnitName(propertyUnitInfo.get("unitName"));
}
// 修改设备使用状态为在用
useInfo.setEquState(String.valueOf(EquimentEnum.ZAIYONG.getCode()));
......@@ -735,6 +735,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
map.put("estateUnitCode", propertyUnitInfo.get("unitCode"));
map.put("estateUnitName", propertyUnitInfo.get("unitCode") + "_" + propertyUnitInfo.get("unitName"));
} else {
map.put("estateUnitCode", null);
map.put("estateUnitName", null);
}
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
......@@ -2467,7 +2470,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
@ResultFieldMapping({
@ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitCode",
@ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitName",
targetField = "estateUnitSeq",
serviceClass = CommonServiceImpl.class,
queryMethod = "queryTcmUnitSeqByCreditCode",
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json
View file @ 0f439483
......@@ -65,11 +65,6 @@
"name": "补证登记",
"code": "DJ_BZ",
"image": "upload/tzs/common/image/补证登记.png"
},
{
"name": "超设计使用年限变更",
"code": "DJ_CSJ",
"image": "upload/tzs/common/image/超设计使用年限.png"
}
],
"WBBA": [
......
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