证管理列表添加是非报废筛选

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

@@ -104,4 +104,10 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "是否气瓶--过滤数据使用   ---目前使用场景：注销报废业务 值为true 只过滤出气瓶的使用登记证）")
     private String isCyl;
 
+    @ApiModelProperty(value = "是否报废状态：1报废 0 未报废 ---目前使用场景：非单位业务办理报废业务，筛选出非报废状态的证--过滤数据使用）")
+    private String isScrap;
+
+    @ApiModelProperty(value = "业务类型code，报废业务使用")
+    private String applyType;
+
 }

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

@@ -169,4 +169,11 @@ public class JgUseRegistrationManage extends BaseEntity {
     @TableField("car_number")
     private String carNumber;
 
+
+    /**
+     * 是否报废状态 1报废 0未报废
+     */
+    @TableField("is_scrap")
+    private String isScrap;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CertificateStatusEnum.java

@@ -10,7 +10,7 @@ import java.util.Map;
 @Getter
 public enum CertificateStatusEnum {
     /**
-     * 设备状态枚举
+     * 使用登记证状态
      *
      */
 

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

@@ -31,7 +31,8 @@
             tjurm.equ_use_address                                               AS equUseAddress,
             tjurm.use_unit_address                                              AS useUnitAddress,
             tjurm.manage_type                                                   AS manageType,
-            tjurm.car_number                                                    AS carNumber
+            tjurm.car_number                                                    AS carNumber,
+            tjurm.is_scrap                                                      AS isScrap
     </sql>
 
 
@@ -123,6 +124,9 @@
             <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
                 AND tjurm.reg_type = '车用气瓶登记'
             </if>
+            <if test="dto.isScrap != null and dto.isScrap != ''">
+                and tjurm.is_scrap = #{dto.isScrap}
+            </if>
             ORDER BY
             <if test="sort != null">
                 tjurm.${sort.field} ${sort.sortType},

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/JgScrapCancelServiceImpl.java

@@ -874,6 +874,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             //设置证状态进行修改
             JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
             jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
+            jgUseRegistrationManage.setIsScrap("1");
             jgUseRegistrationManageMapper.update(jgUseRegistrationManage, updateLambdaQueryWrapper);
         } else {
             SuperviseInfo superviseInfo = new SuperviseInfo();

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 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.CertificateStatusEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.*;
+import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
+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.mapper.JgVehicleInformationMapper;
 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.vo.SortVo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -23,19 +27,17 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -203,6 +205,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                                                                                 JgUseRegistrationManageDto dto,
                                                                                 String sort) {
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
+        if (ApplicationFormTypeEnum.BF.getBusinessCode().equals(dto.getApplyType()) && (!CylinderTypeEnum.CYLINDER.getCode().equals(dto.getEquCategoryCode()) || dto.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName()))){
+            dto.setCertificateStatus(null);
+            dto.setIsScrap("0");
+        }
         return jgUseRegistrationManageMapper.queryForPage(page, dto, sortMap);
 
     }