1.按照台套办理调整-作废功能

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

@@ -549,7 +549,7 @@
         <if test="jsonObject.record != null and jsonObject.record != ''" >
             and ui."RECORD" =  #{jsonObject.record}
         </if>
-        and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and  v.status !='一级受理已驳回' and  v.status !='使用单位已撤回' )
+        and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and  v.status !='一级受理已驳回' and  v.status !='使用单位已撤回' and  v.status !='已作废' )
         ORDER BY ui.REC_DATE DESC
     </select>
 

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

@@ -197,6 +197,7 @@
         and v.status !='使用单位待提交'
         and v.status !='一级受理已驳回'
         and v.status !='使用单位已撤回'
+        and v.status !='已作废'
         and v.sequence_nbr !=#{vehicleId}
         and ve.equ_id in
         <foreach collection="records" item="record" open="(" close=")" separator=",">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -139,7 +139,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipCanUsedByVessel/page")
-    @ApiOperation(httpMethod = "GET", value = "车用气瓶设备列表查询", notes = "车用气瓶设备列表查询")
+    @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")
     public ResponseModel<Page<JSONObject>>queryEquipCanUsedByVesselPage(@RequestParam Map<String, Object> queryMap) {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(jsonObject));

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

@@ -1882,7 +1882,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject) {
+    public Page<JSONObject>  queryEquipCanUsedByVesselPage(JSONObject jsonObject) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
         // 使用单位为个人时候 特殊处理