fix(jg):证书接口增加参数和查询

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

@@ -49,6 +49,15 @@ public class JgUseRegistrationManageDto extends BaseModel {
     @ApiModelProperty(value = "设备品种")
     private String equDefine;
 
+    @ApiModelProperty(value = "设备种类编码")
+    private String equListCode;
+
+    @ApiModelProperty(value = "设备类别编码")
+    private String equCategoryCode;
+
+    @ApiModelProperty(value = "设备品种编码")
+    private String equDefineCode;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 
@@ -76,15 +85,6 @@ public class JgUseRegistrationManageDto extends BaseModel {
     @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

@@ -83,6 +83,25 @@ public class JgUseRegistrationManage extends BaseEntity {
 	@TableField("equ_define")
     private String equDefine;
 
+
+    /**
+     * 设备种类编码
+     */
+    @TableField("equ_list_code")
+    private String equListCode;
+
+    /**
+     * 设备类别编码
+     */
+    @TableField("equ_category_code")
+    private String equCategoryCode;
+
+    /**
+     * 设备品种编码
+     */
+    @TableField("equ_define_code")
+    private String equDefineCode;
+
     /**
      * 备注
      */
@@ -131,24 +150,4 @@ public class JgUseRegistrationManage extends BaseEntity {
     @TableField("equ_use_address")
     private String equUseAddress;
 
-    /**
-     * 设备代码
-     */
-    @TableField("equ_code")
-    private String equCode;
-
-
-    /**
-     * 单位内编号
-     */
-    @TableField("use_inner_code")
-    private String useInnerCode;
-
-
-    /**
-     * 产品编码
-     */
-    @TableField("factory_num")
-    private String factoryNum;
-
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -53,6 +53,29 @@
             <if test="dto.equList != null and dto.equList != ''">
                 and tjurm.equ_list = #{dto.equList}
             </if>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                and tjurm.equ_list_code = #{dto.equListCode}
+            </if>
+            <if test="dto.equCategory != null and dto.equCategory != ''">
+                and tjurm.equ_category = #{dto.equCategory}
+            </if>
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
+                and tjurm.equ_category_code = #{dto.equCategoryCode}
+            </if>
+            <if test="dto.equDefineCode != null and dto.equDefineCode != ''">
+                and tjurm.equ_define = #{dto.equDefineCode}
+            </if>
+            <if test="dto.equDefineCode != null and dto.equDefineCode != ''">
+                and tjurm.equ_define_code = #{dto.equDefineCode}
+            </if>
+            -- 使用登记证编号
+            <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
+                and tjurm.use_registration_code = #{dto.useRegistrationCode}
+            </if>
+            -- 申请单号
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and tjurm.apply_no = #{dto.applyNo}
+            </if>
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
             </if>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -532,21 +532,29 @@
     <select id="getEquTypeByUseRegSeq" 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,
+               jri.EQU_LIST                                                                                      as equListCode,
                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
+               jri.EQU_CATEGORY                                                                                  as equCategoryCode,
+               GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE))       as equDefine,
+               jri.EQU_DEFINE                                                                                    as equDefineCode
         from tzs_jg_use_registration 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>
     <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
+        SELECT
+            ur.sequence_nbr AS sequenceNbr,
+            GROUP_CONCAT ( DISTINCT ( SELECT NAME FROM tz_equipment_category WHERE code = jri.EQU_LIST ) )     AS equList,
+            jri.EQU_LIST                                                                                       as equListCode,
+            GROUP_CONCAT ( DISTINCT ( SELECT NAME FROM tz_equipment_category WHERE code = jri.EQU_CATEGORY ) ) AS equCategory,
+            jri.EQU_CATEGORY                                                                                   as equCategoryCode,
+            GROUP_CONCAT ( DISTINCT ( SELECT NAME FROM tz_equipment_category WHERE code = jri.EQU_DEFINE ) )   AS equDefine,
+            jri.EQU_DEFINE                                                                                     as equDefineCode
+        FROM
+            tzs_jg_vehicle_information ur
+                LEFT JOIN tzs_jg_vehicle_information_eq re ON ur.sequence_nbr = re.vehicle_id
+                LEFT JOIN idx_biz_jg_register_info jri ON re.equ_id = jri.RECORD
         where ur.sequence_nbr = #{sequenceNbr}
     </select>
 </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

@@ -123,8 +123,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
             jgUseRegistrationManage.setRegDate(useRegistration.getRegDate());
             jgUseRegistrationManage.setEquList(equType.get("equList"));
+            jgUseRegistrationManage.setEquListCode(equType.get("equListCode"));
             jgUseRegistrationManage.setEquCategory(equType.get("equCategory"));
+            jgUseRegistrationManage.setEquCategoryCode(equType.get("equCategoryCode"));
             jgUseRegistrationManage.setEquDefine(equType.get("equDefine"));
+            jgUseRegistrationManage.setEquDefineCode(equType.get("equDefineCode"));
             jgUseRegistrationManage.setIsDelete(Boolean.FALSE);
             jgUseRegistrationManage.setRecUserId(useRegistration.getRecUserId());
             jgUseRegistrationManage.setRecUserName(useRegistration.getRecUserName());
@@ -156,8 +159,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName());
             jgUseRegistrationManage.setRegDate(vehicleInformation.getRegDate());
             jgUseRegistrationManage.setEquList(equType.get("equList"));
+            jgUseRegistrationManage.setEquListCode(equType.get("equListCode"));
             jgUseRegistrationManage.setEquCategory(equType.get("equCategory"));
+            jgUseRegistrationManage.setEquCategoryCode(equType.get("equCategoryCode"));
             jgUseRegistrationManage.setEquDefine(equType.get("equDefine"));
+            jgUseRegistrationManage.setEquDefineCode(equType.get("equDefineCode"));
             jgUseRegistrationManage.setIsDelete(Boolean.FALSE);
             jgUseRegistrationManage.setRecUserId(vehicleInformation.getRecUserId());
             jgUseRegistrationManage.setRecUserName(vehicleInformation.getRecUserName());