Skip to content

A
amos-boot-biz
Commit d734edb8 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):证书接口调整

parent 8728ea12
Show whitespace changes
Inline Side-by-side
Showing with 167 additions and 211 deletions
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 @ d734edb8
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.model.BaseModel; import org.typroject.tyboot.core.rdbms.model.BaseModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
*
*
* @author system_generator * @author system_generator
* @date 2024-07-03 * @date 2024-07-03
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgUseRegistrationManageDto", description="") @ApiModel(value = "JgUseRegistrationManageDto", description = "")
public class JgUseRegistrationManageDto extends BaseModel { public class JgUseRegistrationManageDto extends BaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,20 +25,20 @@ public class JgUseRegistrationManageDto extends BaseModel { ...@@ -28,20 +25,20 @@ public class JgUseRegistrationManageDto extends BaseModel {
@ApiModelProperty(value = "申请编号") @ApiModelProperty(value = "申请编号")
private String applyNo; private String applyNo;
@ApiModelProperty(value = "使用登记证状态（登记，注销）") @ApiModelProperty(value = "使用登记证状态（已登记，已注销）")
private String certificateStatus; private String certificateStatus;
@ApiModelProperty(value = "接收机构") @ApiModelProperty(value = "接收机构")
private String receiveOrgName; private String receiveOrgName;
@ApiModelProperty(value = "办理日期") @ApiModelProperty(value = "办理日期")
private Date auditPassDate; private String auditPassDate;
@ApiModelProperty(value = "登记类别") @ApiModelProperty(value = "登记类别")
private String regType; private String regType;
@ApiModelProperty(value = "申请日期") @ApiModelProperty(value = "申请日期")
private Date regDate; private String regDate;
@ApiModelProperty(value = "设备种类") @ApiModelProperty(value = "设备种类")
private String equList; private String equList;
...@@ -59,7 +56,7 @@ public class JgUseRegistrationManageDto extends BaseModel { ...@@ -59,7 +56,7 @@ public class JgUseRegistrationManageDto extends BaseModel {
private String createUserId; private String createUserId;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createDate; private String createDate;
@ApiModelProperty(value = "使用登记编号") @ApiModelProperty(value = "使用登记编号")
private String useRegistrationCode; private String useRegistrationCode;
...@@ -70,16 +67,25 @@ public class JgUseRegistrationManageDto extends BaseModel { ...@@ -70,16 +67,25 @@ public class JgUseRegistrationManageDto extends BaseModel {
@ApiModelProperty(value = "接收机构公司代码") @ApiModelProperty(value = "接收机构公司代码")
private String receiveCompanyCode; private String receiveCompanyCode;
@ApiModelProperty(value = "使用登记证书参数")
private String useRegistrationCertificateParam;
@ApiModelProperty(value = "登记证书编号") @ApiModelProperty(value = "登记证书编号")
private String certificateNo; private String certificateNo;
@ApiModelProperty(value = "使用标志参数")
private String useFlagCertificateParam;
@ApiModelProperty(value = "数据类型：监管/行政审批局，企业") @ApiModelProperty(value = "数据类型：监管/行政审批局，企业")
private String dataType; private String dataType;
@ApiModelProperty(value = "设备使用地址")
private String equUseAddress;
@ApiModelProperty(value = "设备代码")
private String equCode;
@ApiModelProperty(value = "单位内编号")
private String useInnerCode;
@ApiModelProperty(value = "产品编码")
private String factoryNum;
@ApiModelProperty(value = "使用单位统一信用代码-搜索使用")
private String useUnitCreditCodeForSearch;
} }
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 @ d734edb8
...@@ -36,7 +36,7 @@ public class JgUseRegistrationManage extends BaseEntity { ...@@ -36,7 +36,7 @@ public class JgUseRegistrationManage extends BaseEntity {
private String applyNo; private String applyNo;
/** /**
* 使用登记证状态（登记，注销） * 使用登记证状态（已登记，已注销）
*/ */
@TableField("certificate_status") @TableField("certificate_status")
private String certificateStatus; private String certificateStatus;
...@@ -120,21 +120,35 @@ public class JgUseRegistrationManage extends BaseEntity { ...@@ -120,21 +120,35 @@ public class JgUseRegistrationManage extends BaseEntity {
private String receiveCompanyCode; private String receiveCompanyCode;
/** /**
* 使用登记证书参数
*/
@TableField("use_registration_certificate_param")
private String useRegistrationCertificateParam;
/**
* 登记证书唯一标识 * 登记证书唯一标识
*/ */
@TableField("certificate_no") @TableField("certificate_no")
private String certificateNo; private String certificateNo;
/** /**
* 使用标志参数 * 设备使用地址
*/
@TableField("equ_use_address")
private String equUseAddress;
/**
* 设备代码
*/
@TableField("equ_code")
private String equCode;
/**
* 单位内编号
*/
@TableField("use_inner_code")
private String useInnerCode;
/**
* 产品编码
*/ */
@TableField("use_flag_certificate_param") @TableField("factory_num")
private String useFlagCertificateParam; private String factoryNum;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java
View file @ d734edb8
...@@ -69,4 +69,5 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> { ...@@ -69,4 +69,5 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
List<CompanyEquipCountDto> queryForFlowingEquipList(); List<CompanyEquipCountDto> queryForFlowingEquipList();
Map<String,String> getEquTypeByUseRegSeq(@Param("sequenceNbr")String sequenceNbr); Map<String,String> getEquTypeByUseRegSeq(@Param("sequenceNbr")String sequenceNbr);
Map<String,String> getEquTypeByVehSeq(@Param("sequenceNbr")String sequenceNbr);
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ d734edb8
...@@ -4,29 +4,33 @@ ...@@ -4,29 +4,33 @@
<sql id="page_list"> <sql id="page_list">
select select
tjurm.sequence_nbr AS sequence_nbr, tjurm.sequence_nbr AS sequenceNbr,
tjurm.use_unit_name AS use_unit_name, tjurm.use_unit_name AS useUnitName,
tjurm.apply_no AS apply_no, tjurm.apply_no AS applyNo,
tjurm.certificate_status AS certificate_status, tjurm.certificate_status AS certificateStatus,
tjurm.receive_org_name AS receive_org_name, tjurm.receive_org_name AS receiveOrgName,
tjurm.audit_pass_date AS audit_pass_date, DATE_FORMAT(tjurm.audit_pass_date,'%Y-%m-%d') AS auditPassDate,
tjurm.reg_type AS reg_type, tjurm.reg_type AS regType,
DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d') AS reg_date, DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d') AS regDate,
tjurm.equ_list AS equ_list, tjurm.equ_list AS equList,
tjurm.equ_define AS equ_define, tjurm.equ_define AS equDefine,
tjurm.remark AS remark, tjurm.remark AS remark,
tjurm.rec_user_id AS rec_user_id, tjurm.rec_user_id AS recUserId,
DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d') AS rec_date, DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d') AS recDate,
tjurm.create_user_id AS create_user_id, tjurm.create_user_id AS createUserId,
DATE_FORMAT(tjurm.create_date,'%Y-%m-%d') AS create_date, DATE_FORMAT(tjurm.create_date,'%Y-%m-%d') AS createDate,
tjurm.rec_user_name AS rec_user_name, tjurm.rec_user_name AS recUserName,
tjurm.use_registration_code AS use_registration_code, tjurm.use_registration_code AS useRegistrationCode,
tjurm.use_unit_credit_code AS use_unit_credit_code, tjurm.use_unit_credit_code AS useUnitCreditCode,
tjurm.receive_company_code AS receive_company_code, tjurm.receive_company_code AS receiveCompanyCode,
tjurm.use_registration_certificate_param AS use_registration_certificate_param, tjurm.use_registration_certificate_param AS useRegistrationCertificateParam,
tjurm.certificate_no AS certificate_no, tjurm.certificate_no AS certificateNo,
tjurm.use_flag_certificate_param AS use_flag_certificate_param, tjurm.use_flag_certificate_param AS useFlagCertificateParam,
tjurm.equ_category AS equ_category tjurm.equ_category AS equCategory,
tjurm.equ_use_address AS equUseAddress,
tjurm.equ_code AS equCode,
tjurm.use_inner_code AS useInnerCode,
tjurm.factory_num AS factoryNum
</sql> </sql>
...@@ -46,6 +50,18 @@ ...@@ -46,6 +50,18 @@
from tzs_jg_use_registration_manage tjurm from tzs_jg_use_registration_manage tjurm
<where> <where>
tjurm.is_delete = 0 tjurm.is_delete = 0
<if test="dto.equList != null and dto.equList != ''">
and tjurm.equ_list = #{dto.equList}
</if>
<if test="dto.auditPassDate != null and dto.auditPassDate != ''">
and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
</if>
<if test="dto.certificateStatus != null and dto.certificateStatus != ''">
and tjurm.certificate_status = #{dto.certificateStatus}
</if>
<if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
</if>
-- 企业根据企业统一信用代码匹配 -- 企业根据企业统一信用代码匹配
<if test="dto.dataType == 'company' "> <if test="dto.dataType == 'company' ">
AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode} AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ d734edb8
...@@ -539,4 +539,14 @@ ...@@ -539,4 +539,14 @@
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
where ur.sequence_nbr = #{sequenceNbr} where ur.sequence_nbr = #{sequenceNbr}
</select> </select>
<select id="getEquTypeByVehSeq" resultType="java.util.Map">
select ur.sequence_nbr as sequenceNbr,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_LIST)) as equList,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY)) as equCategory,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)) as equDefine
from tzs_jg_vehicle_information ur
LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
where ur.sequence_nbr = #{sequenceNbr}
</select>
</mapper> </mapper>
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 @ d734edb8
...@@ -8,11 +8,9 @@ import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto; ...@@ -8,11 +8,9 @@ import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration; 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.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum; import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.*;
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;
import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService; import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo; import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
...@@ -32,6 +30,7 @@ import org.elasticsearch.index.query.TermsQueryBuilder; ...@@ -32,6 +30,7 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
...@@ -64,39 +63,61 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -64,39 +63,61 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
private JgUseRegistrationEqMapper jgUseRegistrationEqMapper; private JgUseRegistrationEqMapper jgUseRegistrationEqMapper;
@Autowired @Autowired
private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
@Autowired
private CommonServiceImpl commonServiceImpl; private CommonServiceImpl commonServiceImpl;
@Autowired @Autowired
private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService; private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
@Autowired @Autowired
private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService; private JgVehicleInformationMapper jgVehicleInformationMapper;
@Autowired @Autowired
private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService; private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
@Autowired
private JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
/** /**
* 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中 * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
*/ */
@Transactional(rollbackFor = Exception.class)
public Boolean brushHistoryCertificate() { public Boolean brushHistoryCertificate() {
this.baseMapper.delete(new LambdaQueryWrapper<>()); this.baseMapper.delete(new LambdaQueryWrapper<>());
// 使用登记表中已经审批通过的单子 // 使用登记表中已经审批通过的单子
List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>() List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>()
.eq(JgUseRegistration::getStatus, "已完成")); .eq(JgUseRegistration::getStatus, "已完成"));
for (JgUseRegistration useRegistration : jgUseRegistrations) { for (JgUseRegistration useRegistration : jgUseRegistrations) {
// 设备使用地址
String fullAddress = "";
// 设备种类/类别/品种 // 设备种类/类别/品种
Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByUseRegSeq(String.valueOf(useRegistration.getSequenceNbr())); Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByUseRegSeq(String.valueOf(useRegistration.getSequenceNbr()));
if (!"unit".equals(useRegistration.getManageType())){
List<JgUseRegistrationEq> jgUseRegistrationEqs = jgUseRegistrationEqMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationEq>()
.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()));
if (!ValidationUtil.isEmpty(jgUseRegistrationEqs)){
String equId = jgUseRegistrationEqs.get(0).getEquId();
IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOne(new QueryWrapper<IdxBizJgUseInfo>()
.eq("RECORD", equId));
if (!ObjectUtils.isEmpty(useInfo.getProvinceName())) {
fullAddress += useInfo.getProvinceName();
}
if (!ObjectUtils.isEmpty(useInfo.getCityName())) {
fullAddress += useInfo.getCityName();
}
if (!ObjectUtils.isEmpty(useInfo.getCountyName())) {
fullAddress += useInfo.getCountyName();
}
if (!ObjectUtils.isEmpty(useInfo.getStreetName())) {
fullAddress += useInfo.getStreetName();
}
if (!ObjectUtils.isEmpty(useInfo.getAddress())) {
fullAddress += useInfo.getAddress();
}
}
}
// 组装数据 // 组装数据
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage(); JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
jgUseRegistrationManage.setUseUnitName(useRegistration.getUseUnitName()); jgUseRegistrationManage.setUseUnitName(useRegistration.getUseUnitName());
jgUseRegistrationManage.setApplyNo(useRegistration.getApplyNo()); jgUseRegistrationManage.setApplyNo(useRegistration.getApplyNo());
jgUseRegistrationManage.setCertificateStatus("登记"); jgUseRegistrationManage.setCertificateStatus("已登记");
jgUseRegistrationManage.setReceiveOrgName(useRegistration.getReceiveOrgName()); jgUseRegistrationManage.setReceiveOrgName(useRegistration.getReceiveOrgName());
jgUseRegistrationManage.setAuditPassDate(useRegistration.getAuditPassDate()); jgUseRegistrationManage.setAuditPassDate(useRegistration.getAuditPassDate());
jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()); jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
...@@ -109,168 +130,51 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -109,168 +130,51 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
jgUseRegistrationManage.setRecUserName(useRegistration.getRecUserName()); jgUseRegistrationManage.setRecUserName(useRegistration.getRecUserName());
jgUseRegistrationManage.setRecDate(useRegistration.getRecDate()); jgUseRegistrationManage.setRecDate(useRegistration.getRecDate());
jgUseRegistrationManage.setCreateUserId(useRegistration.getCreateUserId()); jgUseRegistrationManage.setCreateUserId(useRegistration.getCreateUserId());
jgUseRegistrationManage.setCreateDate(useRegistration.getCreateDate()); jgUseRegistrationManage.setCreateDate(useRegistration.getRecDate());
jgUseRegistrationManage.setEquUseAddress(fullAddress);
jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode()); jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode()); jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode()); jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,useRegistration.getAuditPassDate(),useRegistration.getReceiveCompanyCode())); jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,useRegistration.getAuditPassDate(),useRegistration.getReceiveCompanyCode()));
// jgUseRegistrationManage.setUseRegistrationCertificateParam(this.buildUseRegistrationCertificateParam(useRegistration));
// jgUseRegistrationManage.setUseFlagCertificateParam(this.buildUseFlagCertificateParam());
this.baseMapper.insert(jgUseRegistrationManage); this.baseMapper.insert(jgUseRegistrationManage);
} }
// 车用气瓶使用登记表中已经审批通过的单子 // 车用气瓶使用登记表中已经审批通过的单子
List<JgVehicleInformation> jgVehicleInformations = jgVehicleInformationMapper.selectList(new LambdaQueryWrapper<JgVehicleInformation>()
.eq(JgVehicleInformation::getStatus, "已完成"));
for (JgVehicleInformation vehicleInformation : jgVehicleInformations) {
// 设备种类/类别/品种
Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByVehSeq(String.valueOf(vehicleInformation.getSequenceNbr()));
// 组装数据
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
jgUseRegistrationManage.setUseUnitName(vehicleInformation.getUseUnitName());
jgUseRegistrationManage.setApplyNo(vehicleInformation.getApplyNo());
jgUseRegistrationManage.setCertificateStatus("已登记");
jgUseRegistrationManage.setReceiveOrgName(vehicleInformation.getReceiveOrgName());
jgUseRegistrationManage.setAuditPassDate(vehicleInformation.getAuditPassDate());
jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName());
jgUseRegistrationManage.setRegDate(vehicleInformation.getRegDate());
jgUseRegistrationManage.setEquList(equType.get("equList"));
jgUseRegistrationManage.setEquCategory(equType.get("equCategory"));
jgUseRegistrationManage.setEquDefine(equType.get("equDefine"));
jgUseRegistrationManage.setIsDelete(Boolean.FALSE);
jgUseRegistrationManage.setRecUserId(vehicleInformation.getRecUserId());
jgUseRegistrationManage.setRecUserName(vehicleInformation.getRecUserName());
jgUseRegistrationManage.setRecDate(vehicleInformation.getRecDate());
jgUseRegistrationManage.setCreateUserId(vehicleInformation.getCreateUserId());
jgUseRegistrationManage.setCreateDate(vehicleInformation.getRecDate());
jgUseRegistrationManage.setEquUseAddress("");
jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,vehicleInformation.getAuditPassDate(),vehicleInformation.getReceiveCompanyCode()));
this.baseMapper.insert(jgUseRegistrationManage);
}
return Boolean.TRUE; return Boolean.TRUE;
} }
/**
* 组装使用登记证参数
*/
// private String buildUseRegistrationCertificateParam(JgUseRegistration useRegistration) {
// Map<String, Object> exportParamsMap = getStringObjectMap(useRegistration);
// return JSON.toJSONString(exportParamsMap);
// }
// private Map<String, Object> getStringObjectMap(JgUseRegistration useRegistration) {
// Map<String, Object> exportParamsMap = new HashMap<>();
// exportParamsMap.put("manageType", useRegistration.getManageType());
// LambdaQueryWrapper<JgUseRegistrationEq> useEqLambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
// useEqLambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());
// List<JgUseRegistrationEq> useRegistrationEqList = jgUseRegistrationEqMapper.selectList(useEqLambda);
//
// if (ValidationUtil.isEmpty(useRegistration) || ValidationUtil.isEmpty(useRegistrationEqList)) {
// throw new BadRequest("使用登记证导出失败,请稍后重试!");
// }
// // 登记机关
// if (ValidationUtil.isEmpty(useRegistration.getReceiveOrgName())) {
// throw new BadRequest("使用登记证导出失败,登记机关为空!");
// }
// exportParamsMap.put("receiveOrgName", useRegistration.getReceiveOrgName());
// // 使用登记证编号
// if (ValidationUtil.isEmpty(useRegistration.getUseRegistrationCode())) {
// throw new BadRequest("使用登记证导出失败,使用登记证编号为空!");
// }
// exportParamsMap.put("useRegistrationCode", useRegistration.getUseRegistrationCode());
// // 使用单位名称
// if (ValidationUtil.isEmpty(useRegistration.getUseUnitName())) {
// throw new BadRequest("使用登记证导出失败,使用单位名称为空!");
// }
// exportParamsMap.put("useUnitName", useRegistration.getUseUnitName());
//
// // 监管码
// if (ValidationUtil.isEmpty(useRegistration.getSupervisoryCode())) {
// throw new BadRequest("使用登记证导出失败,监管码为空!");
// }
// exportParamsMap.put("supervisoryCode", useRegistration.getSupervisoryCode());
//
// JgUseRegistrationServiceImpl.getAuditPassedDate(useRegistration.getAuditPassDate(), exportParamsMap);
//
// // 查询设备注册信息
// IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", useRegistrationEqList.get(0).getEquId()));
// if (!ValidationUtil.isEmpty(registerInfo)) {
// // 设备种类、类别、品种
// String equList = registerInfo.getEquList();// 设备种类
// String equCategory = registerInfo.getEquCategory();// 设备类别
// String equDefine = registerInfo.getEquDefine();// 设备品种
// List<EquipmentCategory> categoryList0 = commonServiceImpl.getEquipmentCategoryList(equList, null);
// List<EquipmentCategory> categoryList1 = commonServiceImpl.getEquipmentCategoryList(equCategory, null);
// List<EquipmentCategory> categoryList2 = commonServiceImpl.getEquipmentCategoryList(equDefine, null);
// if (CollectionUtils.isNotEmpty(categoryList0)) {
// if (ValidationUtil.isEmpty(categoryList0.get(0).getName())) {
// throw new BadRequest("使用登记证导出失败,设备种类为空!");
// }
// exportParamsMap.put("equList", categoryList0.get(0).getName());
// }
// if (CollectionUtils.isNotEmpty(categoryList1)) {
// if (ValidationUtil.isEmpty(categoryList1.get(0).getName())) {
// throw new BadRequest("使用登记证导出失败,设备类别为空!");
// }
// exportParamsMap.put("equCategory", categoryList1.get(0).getName());
// }
// if (CollectionUtils.isNotEmpty(categoryList2)) {
// if (ValidationUtil.isEmpty(categoryList2.get(0).getName())) {
// throw new BadRequest("使用登记证导出失败,设备品种为空!");
// }
// exportParamsMap.put("equDefine", categoryList2.get(0).getName());
// }
// // 设备代码
// if (ValidationUtil.isEmpty(registerInfo.getEquCode())) {
// throw new BadRequest("使用登记证导出失败,设备代码为空!");
// }
// exportParamsMap.put("equCode", registerInfo.getEquCode());
// }
//
// IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(useRegistrationEqList.get(0).getEquId());
// if (!ValidationUtil.isEmpty(useInfo)) {
// if (ValidationUtil.isEmpty(useInfo.getUseInnerCode())) {
// throw new BadRequest("使用登记证导出失败,设备单位内部编码为空!");
// }
// // 单位内部编码
// exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
// // 设备使用地址
// String fullAddress = "";
// if (!ObjectUtils.isEmpty(useInfo.getProvinceName())) {
// fullAddress += useInfo.getProvinceName();
// }
// if (!ObjectUtils.isEmpty(useInfo.getCityName())) {
// fullAddress += useInfo.getCityName();
// }
// if (!ObjectUtils.isEmpty(useInfo.getCountyName())) {
// fullAddress += useInfo.getCountyName();
// }
// if (!ObjectUtils.isEmpty(useInfo.getStreetName())) {
// fullAddress += useInfo.getStreetName();
// }
// if (!ObjectUtils.isEmpty(useInfo.getAddress())) {
// fullAddress += useInfo.getAddress();
// }
// if (ValidationUtil.isEmpty(fullAddress)) {
// throw new BadRequest("使用登记证导出失败,设备使用地址为空!");
// }
// exportParamsMap.put("fullAddress", fullAddress);
// }
// IdxBizJgFactoryInfo factoryInfo = idxBizJgFactoryInfoService.getOneData(useRegistrationEqList.get(0).getEquId());
// // 产品编号(出厂编号)
// if (!ValidationUtil.isEmpty(factoryInfo)) {
// if (ValidationUtil.isEmpty(factoryInfo.getFactoryNum())) {
// throw new BadRequest("使用登记证导出失败,产品编号为空!");
// }
// exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
// }
// exportParamsMap.put("applyNo", useRegistration.getApplyNo());
// return exportParamsMap;
// }
/**
* 组装使用标志参数
*/
// private String buildUseFlagCertificateParam(JgUseRegistration useRegistration) {
// Map<String, Object> exportParamsMap = getStringObjectMap(useRegistration);
// UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
// useFlagParamDto.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
// useFlagParamDto.setEquList(exportParamsMap.get("equList").toString());
// useFlagParamDto.setEquListCode(registerInfo.getEquList());
// useFlagParamDto.setEquipCode(registerInfo.getEquCode());
// useFlagParamDto.setEquipCategory(exportParamsMap.get("equCategory").toString());
// useFlagParamDto.setEquipDefine(Optional.ofNullable(exportParamsMap.get("equDefine"))
// .orElse(exportParamsMap.get("equCategory").toString())
// .toString());
// useFlagParamDto.setUseUnitName(exportParamsMap.get("useUnitName").toString());
// useFlagParamDto.setUseInnerCode(exportParamsMap.get("useInnerCode").toString());
// useFlagParamDto.setReceiveOrgName(useRegistration.getReceiveOrgName());
// useFlagParamDto.setUseRegistrationCode(exportParamsMap.get("useRegistrationCode").toString());
// useFlagParamDto.setFactoryNumber(factoryInfo.getFactoryNum());
// useFlagParamDto.setCarNumber(registerInfo.getCarNumber());
// useFlagParamDto.setApplyNo(useRegistration.getApplyNo());
// // 检验信息字段设置
// jgUseRegistrationServiceImpl.setInspectField(registerInfo, useFlagParamDto);
// // 电梯维保信息字段设置
// jgUseRegistrationServiceImpl.setMainInfoField(registerInfo, useFlagParamDto);
// // 车用气瓶专用字段 暂无数据源 需车用气瓶功能开发完成后进行
// useFlagParamDto.setCylinderNumOrVolume("");
// useFlagParamDto.setFillingMedium("");
// return JSON.toJSONString(useFlagParamDto);
// }
/** /**
* 分页查询 * 分页查询
...@@ -288,9 +192,14 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -288,9 +192,14 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) { public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
return jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto); return jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto);
} }
/**
* 根据证的sequenceNbr，查询证下面的所有设备
*/
public List<JSONObject> queryEquByCertificateSeq(Long sequenceNbr) { public List<JSONObject> queryEquByCertificateSeq(Long sequenceNbr) {
return queryEquByCertificateSeqList(Collections.singletonList(sequenceNbr)); return queryEquByCertificateSeqList(Collections.singletonList(sequenceNbr));
} }
/** /**
* 根据证的sequenceNbr集合，批量查询证下面的所有设备 * 根据证的sequenceNbr集合，批量查询证下面的所有设备
*/ */
......
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