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/mapper/JgUseRegistrationMapper.java

@@ -53,8 +53,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Page<JSONObject> queryForUnitVesselEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records);
 
-    Page<JSONObject> queryForUnitSkidMountedEquipment(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records);
-
     Page<JSONObject> queryForEquipUsedByVehiclePage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
 
     @MapKey("records")

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

@@ -548,34 +548,6 @@
         ORDER BY ui.REC_DATE DESC
     </select>
 
-    <select id="queryForUnitSkidMountedEquipment" resultType="com.alibaba.fastjson.JSONObject">
-        <include refid="page-list-vessel"/>
-        WHERE
-        ri."EQU_CATEGORY" = '2100'
-        and ri."WHETHER_SKID_MOUNTED_PRESSURE_VESSEL" = '1'
-        and ui."DATA_SOURCE" = 'jg'
-        and NOT(ui."EQU_STATE" is not null )
-        and NOT(ri."USE_ORG_CODE" is not null )
-        and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''">
-            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
-        </if>
-        <choose>
-            <when test="jsonObject.record != null and jsonObject.record != ''">
-                and ui."RECORD" =  #{jsonObject.record}
-            </when>
-            <otherwise>
-                <if test="records != null and records.size() > 0">
-                    and ui."RECORD" not in
-                    <foreach collection="records" item="record" separator="," open="(" close=")">
-                        #{record}
-                    </foreach>
-                </if>
-            </otherwise>
-        </choose>
-        ORDER BY ui.REC_DATE DESC
-    </select>
-
     <select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject">
         <include refid="page-list-vessel"/>
         WHERE

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

@@ -1935,12 +1935,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
             });
             return result;
-        } else if ("2100".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
-            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
-            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
-            Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitSkidMountedEquipment(page, jsonObject, records);
-            result.getRecords().forEach(x -> x.put("chargingMedium", fillingMediumMap.get(x.get("chargingMedium"))));
-            return result;
         }
         return page;
     }