Skip to content

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

fix(jg):证书接口调整

parent 8728ea12
Expand all Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 47 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;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2024-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgUseRegistrationManageDto", description="")
@ApiModel(value = "JgUseRegistrationManageDto", description = "")
public class JgUseRegistrationManageDto extends BaseModel {
private static final long serialVersionUID = 1L;
......@@ -28,20 +25,20 @@ public class JgUseRegistrationManageDto extends BaseModel {
@ApiModelProperty(value = "申请编号")
private String applyNo;
@ApiModelProperty(value = "使用登记证状态（登记，注销）")
@ApiModelProperty(value = "使用登记证状态（已登记，已注销）")
private String certificateStatus;
@ApiModelProperty(value = "接收机构")
private String receiveOrgName;
@ApiModelProperty(value = "办理日期")
private Date auditPassDate;
private String auditPassDate;
@ApiModelProperty(value = "登记类别")
private String regType;
@ApiModelProperty(value = "申请日期")
private Date regDate;
private String regDate;
@ApiModelProperty(value = "设备种类")
private String equList;
......@@ -59,7 +56,7 @@ public class JgUseRegistrationManageDto extends BaseModel {
private String createUserId;
@ApiModelProperty(value = "创建时间")
private Date createDate;
private String createDate;
@ApiModelProperty(value = "使用登记编号")
private String useRegistrationCode;
......@@ -70,16 +67,25 @@ public class JgUseRegistrationManageDto extends BaseModel {
@ApiModelProperty(value = "接收机构公司代码")
private String receiveCompanyCode;
@ApiModelProperty(value = "使用登记证书参数")
private String useRegistrationCertificateParam;
@ApiModelProperty(value = "登记证书编号")
private String certificateNo;
@ApiModelProperty(value = "使用标志参数")
private String useFlagCertificateParam;
@ApiModelProperty(value = "数据类型：监管/行政审批局，企业")
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 {
private String applyNo;
/**
* 使用登记证状态（登记，注销）
* 使用登记证状态（已登记，已注销）
*/
@TableField("certificate_status")
private String certificateStatus;
......@@ -120,21 +120,35 @@ public class JgUseRegistrationManage extends BaseEntity {
private String receiveCompanyCode;
/**
* 使用登记证书参数
*/
@TableField("use_registration_certificate_param")
private String useRegistrationCertificateParam;
/**
* 登记证书唯一标识
*/
@TableField("certificate_no")
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")
private String useFlagCertificateParam;
@TableField("factory_num")
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> {
List<CompanyEquipCountDto> queryForFlowingEquipList();
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 @@
<sql id="page_list">
select
tjurm.sequence_nbr AS sequence_nbr,
tjurm.use_unit_name AS use_unit_name,
tjurm.apply_no AS apply_no,
tjurm.certificate_status AS certificate_status,
tjurm.receive_org_name AS receive_org_name,
tjurm.audit_pass_date AS audit_pass_date,
tjurm.reg_type AS reg_type,
DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d') AS reg_date,
tjurm.equ_list AS equ_list,
tjurm.equ_define AS equ_define,
tjurm.sequence_nbr AS sequenceNbr,
tjurm.use_unit_name AS useUnitName,
tjurm.apply_no AS applyNo,
tjurm.certificate_status AS certificateStatus,
tjurm.receive_org_name AS receiveOrgName,
DATE_FORMAT(tjurm.audit_pass_date,'%Y-%m-%d') AS auditPassDate,
tjurm.reg_type AS regType,
DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d') AS regDate,
tjurm.equ_list AS equList,
tjurm.equ_define AS equDefine,
tjurm.remark AS remark,
tjurm.rec_user_id AS rec_user_id,
DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d') AS rec_date,
tjurm.create_user_id AS create_user_id,
DATE_FORMAT(tjurm.create_date,'%Y-%m-%d') AS create_date,
tjurm.rec_user_name AS rec_user_name,
tjurm.use_registration_code AS use_registration_code,
tjurm.use_unit_credit_code AS use_unit_credit_code,
tjurm.receive_company_code AS receive_company_code,
tjurm.use_registration_certificate_param AS use_registration_certificate_param,
tjurm.certificate_no AS certificate_no,
tjurm.use_flag_certificate_param AS use_flag_certificate_param,
tjurm.equ_category AS equ_category
tjurm.rec_user_id AS recUserId,
DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d') AS recDate,
tjurm.create_user_id AS createUserId,
DATE_FORMAT(tjurm.create_date,'%Y-%m-%d') AS createDate,
tjurm.rec_user_name AS recUserName,
tjurm.use_registration_code AS useRegistrationCode,
tjurm.use_unit_credit_code AS useUnitCreditCode,
tjurm.receive_company_code AS receiveCompanyCode,
tjurm.use_registration_certificate_param AS useRegistrationCertificateParam,
tjurm.certificate_no AS certificateNo,
tjurm.use_flag_certificate_param AS useFlagCertificateParam,
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>
......@@ -46,6 +50,18 @@
from tzs_jg_use_registration_manage tjurm
<where>
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' ">
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 @@
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
where ur.sequence_nbr = #{sequenceNbr}
</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>
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