登记证列表查询修改

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

@@ -50,7 +50,7 @@
             <if test="dto.equListCode != null and dto.equListCode != ''">
                 and tjurm.equ_list_code = #{dto.equListCode}
             </if>
-            <if test="dto.equCategoryCode != null and dto.equCategoryCode != '' and dto.isCyl != 1  ">
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
                 and tjurm.equ_category_code = #{dto.equCategoryCode}
             </if>
             <if test="dto.equDefineCode != null and dto.equDefineCode != ''">
@@ -60,6 +60,9 @@
                 and tjurm.certificate_status = #{dto.certificateStatus}
             </if>
             <if test="dto.isCyl != null and dto.isCyl == 1 ">
+                AND tjurm.reg_type != '车用气瓶登记'
+            </if>
+            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
                 AND tjurm.reg_type = '车用气瓶登记'
             </if>
             ORDER BY tjurm.rec_date DESC

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

@@ -306,6 +306,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
      * 列表查询
      */
     public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
+        if("1".equals(dto.getWhetherVehicleCylinder())){
+            dto.setEquCategoryCode(CylinderTypeEnum.CYLINDER.getCode());
+        }
         return jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto);
     }