Skip to content

A
amos-boot-biz
Commit b6f9d1f7 authored by suhuiguang's avatar suhuiguang
Browse files
Options

如下业务：在操作证时记录属地监管部门

1.安装告知 2.使用登记 3.车用气瓶登记 4.车用气瓶单位变更登记 5.移装变更登记 6.历史有证气瓶导入 7.历史有证压力管道-管道导入-工业管道
parent 7cbce420
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 21 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/JgUseRegistrationManageDto.java
View file @ b6f9d1f7
......@@ -118,4 +118,10 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty(value = "变更原因")
private String changeReason;
@ApiModelProperty("管辖机构")
private String superviseOrgCode;
@ApiModelProperty("管辖机构名称")
private String superviseOrgName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java
View file @ b6f9d1f7
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -130,4 +131,10 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty("是否在流程中,值：true / false ")
private String certInBusinessFlag;
@ApiModelProperty("管辖机构")
private String superviseOrgCode;
@ApiModelProperty("管辖机构名称")
private String superviseOrgName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java
View file @ b6f9d1f7
......@@ -222,4 +222,16 @@ public class JgUseRegistrationManage extends BaseEntity {
@TableField("reissue_date")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date reissueDate;
/**
* 管辖机构
*/
@TableField
private String superviseOrgCode;
/**
* 管辖机构名称
*/
@TableField
private String superviseOrgName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java
View file @ b6f9d1f7
......@@ -45,6 +45,8 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
String getOrgCodeByCompanyCode(String companyCode);
String getCompanyNameByOrgCode(String orgCode);
String selectBusinessData(String tableName, String instanceId);
String selectPromoterData(String tableName, String instanceId);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ b6f9d1f7
......@@ -88,7 +88,11 @@
<select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
select org_code from privilege_company where company_code = #{companyCode} limit 1
</select>
</select>
<select id="getCompanyNameByOrgCode" resultType="java.lang.String">
select company_name from privilege_company where org_code = #{orgCode} limit 1
</select>
<select id="selectBusinessData" resultType="java.lang.String">
select
......
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/DataDockServiceImpl.java
View file @ b6f9d1f7
......@@ -2038,6 +2038,8 @@ public class DataDockServiceImpl {
.manageType("unit")
.isScrap("0")
.version(1)
.superviseOrgCode(paramsDto.getOrgBranchCode())
.superviseOrgName(paramsDto.getOrgBranchName())
.build();
jgUseRegistrationManageService.save(registrationManage);
return registrationManage;
......
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 @ b6f9d1f7
......@@ -4006,13 +4006,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
jgUseRegistrationManage.setUseUnitName(company.getCompanyName());
jgUseRegistrationManage.setReceiveOrgName(equipInfoDto.getReceiveOrgName());
jgUseRegistrationManage.setReceiveCompanyCode(equipInfoDto.getReceiveOrgCode());
jgUseRegistrationManage.setSuperviseOrgName(orgBranchName);
jgUseRegistrationManage.setSuperviseOrgCode(orgBranchCode);
jgUseRegistrationManageService.updateById(jgUseRegistrationManage);
} else {
throw new BadRequest("该使用登记证编号系统已存在，请核对使用登记证编号后，重新上传!");
}
} else {
jgUseRegistration.setIsAddEquip("0");
jgUseRegistrationManage = this.saveRegistrationManage(equipInfoDto, company);
jgUseRegistrationManage = this.saveRegistrationManage(equipInfoDto, company, orgBranchCode, orgBranchName);
}
// 生成一条tzs_jg_certificate_change_record记录
generateCertificateChangeRecord(jgUseRegistrationManage, changeRecordId);
......@@ -4179,7 +4181,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
return dto;
}
private JgUseRegistrationManage saveRegistrationManage(EquipmentInfoDto equipInfoDto, CompanyBo company) {
private JgUseRegistrationManage saveRegistrationManage(EquipmentInfoDto equipInfoDto, CompanyBo company, String orgBranchCode, String orgBranchName) {
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
jgUseRegistrationManage.setApplyNo(this.getApplicationNo());
jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
......@@ -4197,6 +4199,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
jgUseRegistrationManage.setEquUseAddress("");
jgUseRegistrationManage.setManageType("unit");
jgUseRegistrationManage.setCreateDate(new Date());
jgUseRegistrationManage.setSuperviseOrgName(orgBranchName);
jgUseRegistrationManage.setSuperviseOrgCode(orgBranchCode);
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(baseEnterpriseInfoMapper.selectByUseUnit(company.getCompanyName())) ? baseEnterpriseInfoMapper.selectByUseUnit(company.getCompanyName()).getAddress() : "");
jgUseRegistrationManage.setUseRegistrationCode(equipInfoDto.getUseOrgCode());
jgUseRegistrationManage.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
......
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/JgChangeRegistrationTransferServiceImpl.java
View file @ b6f9d1f7
......@@ -18,10 +18,7 @@ import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
import com.yeejoin.amos.boot.module.jg.api.common.StringUtil;
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.EquipTypeEnum;
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.*;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferEqService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
......@@ -1002,6 +999,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if (isUpdateRegistrationCode){
useRegistrationManageService.lambdaUpdate()
.set(JgUseRegistrationManage::getIsScrap, 1)
// TODO 区外移装，业务已限制需要先注销证，这主要目的是将韩城、杨凌的特殊《区内逻辑》但是需要新生成的证的把之前证改成已注销
.set(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName())
.in(JgUseRegistrationManage::getSequenceNbr,
registrationList.stream()
.map(JgUseRegistrationManage::getSequenceNbr)
......@@ -1011,6 +1010,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
List<JgUseRegistrationManage> newRegistrationList = new ArrayList<>();
// 新增-区外，或者区内是韩城和杨凌新生成证的新生成证（通过setSequenceNbr(null)），其他无需新生成证的进行证的更新
List<JSONObject> updatedRegistrationList = registrationList.stream()
.map(registrationManage -> {
Map<String, String> equType = new HashMap<>();
......@@ -1048,6 +1048,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
registrationManageNew.setChangeReason("");
registrationManageNew.setVersion(1);
}
// 所属监管单位
String orgBranchCodeName = historyJson.getString("orgBranchCode");
String orgBranchName = historyJson.getString("orgBranchName");
String[] orgBranchArray = orgBranchCodeName.split("_");
if(orgBranchArray.length > 1){
registrationManageNew.setSuperviseOrgCode(orgBranchArray[0]);
registrationManageNew.setSuperviseOrgName(StringUtil.isNotEmpty(orgBranchName) ? orgBranchName : orgBranchArray[1]);
}
// 添加到新列表中
newRegistrationList.add(registrationManageNew);
......
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 @ b6f9d1f7
......@@ -512,7 +512,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
CompanyModel receiveParentResult = Privilege.companyClient.seleteOne(receiveCompanyResult.getParentId()).getResult();
receiveCompanyCode = receiveParentResult.getCompanyCode();
}
// 生成新的监管码
// 生成新的使用登记证编号
String code = this.generateVehicleUseRegistrationCode(receiveCompanyCode, manage.getEquDefineCode());
manage.setUseRegistrationCode(code);
// 更新设备使用登记证信息
......@@ -546,6 +546,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
manage.setCarNumber(jgChangeVehicleRegistrationUnit.getNewCarNumber() != null ? jgChangeVehicleRegistrationUnit.getNewCarNumber() : jgChangeVehicleRegistrationUnit.getCarNumber());
manage.setVersion(manage.getVersion() + 1);
manage.setChangeReason(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName());
manage.setSuperviseOrgCode(jgChangeVehicleRegistrationUnit.getOrgBranchCode());
manage.setSuperviseOrgName(jgChangeVehicleRegistrationUnit.getOrgBranchName());
jgUseRegistrationManageService.updateById(manage);
// 保存证流水信息
jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
......
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/JgEnableDisableServiceImpl.java
View file @ b6f9d1f7
......@@ -66,9 +66,6 @@ import java.util.stream.Collectors;
public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto, JgEnableDisable, JgEnableDisableMapper> implements IJgEnableDisableService, ICompensateFlowDataOfRedis<JgEnableDisable> {
@Autowired
WorkFlowFeignService workFlowFeginService;
@Autowired
RedisUtils redisUtils;
@Autowired
......@@ -78,13 +75,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
JgEnableDisableEqMapper jgEnableDisableEqMapper;
@Autowired
JgMaintainNoticeMapper jgMaintainNoticeMapper;
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
private final List<String> NOT_FLOWING_STATE = Arrays.asList("待提交", "已驳回", "已撤回", "已作废", "已完成");
private final String PROCESS_DEFINITION_KEY = "deactivateEnable";
......
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 @ b6f9d1f7
......@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
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.*;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
......@@ -238,6 +239,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
@Autowired
private RegistrationInfoMapper registrationInfoMapper;
@Autowired
private CommonMapper commonMapper;
/**
......@@ -1393,6 +1396,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
jgUseRegistrationManage.setManageType(jgUseRegistration.getManageType());
this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
jgUseRegistrationManageService.updateById(jgUseRegistrationManage);
}
}
......@@ -1412,6 +1416,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
jgUseRegistrationManage.setSequenceNbr(useRegistrationManageSeq);
this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);
return;
}
......@@ -1453,9 +1458,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistrationManage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
jgUseRegistrationManage.setManageType(jgUseRegistration.getManageType());
jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, new Date(), jgUseRegistration.getReceiveCompanyCode()));
this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
jgUseRegistrationManageService.save(jgUseRegistrationManage);
}
private void setSuperviseOrgInfo(JgUseRegistrationManage jgUseRegistrationManage, JgUseRegistration jgUseRegistration) {
jgUseRegistrationManage.setSuperviseOrgCode(jgUseRegistration.getSupervisionOrgCode());
jgUseRegistrationManage.setSuperviseOrgName(commonMapper.getCompanyNameByOrgCode(jgUseRegistration.getSupervisionOrgCode()));
}
public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, String carNumber, Boolean isFirst, JSONObject jsonObject) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String role = workflowResultDto.getNextExecutorRoleIds();
......
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/JgVehicleInformationServiceImpl.java
View file @ b6f9d1f7
......@@ -1704,6 +1704,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
jgUseRegistrationManage.setGasNum(jgVehicleInformation.getGasNum());
jgUseRegistrationManage.setCarNumber(jgVehicleInformation.getCarNumber());
jgUseRegistrationManage.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));
jgUseRegistrationManage.setSuperviseOrgName(jgVehicleInformation.getOrgBranchName());
jgUseRegistrationManage.setSuperviseOrgCode(jgVehicleInformation.getOrgBranchCode());
jgUseRegistrationManageService.save(jgUseRegistrationManage);
}
......@@ -2010,6 +2012,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
.one();
if (useRegistrationManage != null) {
useRegistrationManage.setCarNumber(vehicleInformation.getCarNumber());
useRegistrationManage.setSuperviseOrgName(vehicleInformation.getOrgBranchName());
useRegistrationManage.setSuperviseOrgCode(vehicleInformation.getOrgBranchCode());
jgUseRegistrationManageService.updateById(useRegistrationManage);
}
}
......@@ -2229,13 +2233,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
// 登记证记录表主键
Long changeRecordId = sequence.nextId();
this.getBaseMapper().updateById(vehicleInformation);
JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
.eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
.eq(JgUseRegistrationManage::getIsDelete, 0)
.one();
if (useRegistrationCode != null) {
useRegistrationCode.setCarNumber(vehicleInformation.getCarNumber());
jgUseRegistrationManageService.updateById(useRegistrationCode);
if (jgUseRegistrationManage != null) {
jgUseRegistrationManage.setCarNumber(vehicleInformation.getCarNumber());
jgUseRegistrationManage.setSuperviseOrgName(vehicleInformation.getOrgBranchName());
jgUseRegistrationManage.setSuperviseOrgCode(vehicleInformation.getOrgBranchCode());
jgUseRegistrationManageService.updateById(jgUseRegistrationManage);
}
// 更新关联气瓶信息
......
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