气瓶数据项调整 / 发起页调整

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

@@ -928,7 +928,11 @@
             pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
             pv."VIN"          vin,
             to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') inspectDate,
-            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate,
+            ri.PRODUCT_PHOTO productPhoto,
+            (select INFORMATION_SITUATION from idx_biz_jg_other_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) informationSituation,
+            (select CYLINDER_STAMP_ATTACHMENT from idx_biz_jg_other_info where  "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) cylinderStampAttachment,
+            (select INFORMATION_MANAGE_CODE from idx_biz_jg_other_info where  "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) informationManageCode
         FROM
             idx_biz_jg_use_info ui
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"

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

@@ -170,7 +170,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
             dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList());
         }
         //如果是单位录入只显示气瓶
-        if((("black".equals(dataSource) || ("his".equals(dataSource) )) && "2000".equals(equList) && "DW_LR".equals(type) && "0".equals(businessScenarios))){
+        if(("2000".equals(equList) && "DW_LR".equals(type) && "0".equals(businessScenarios))){
             List<DictionarieValueModel> result = new ArrayList<>();
             if(CollectionUtil.isNotEmpty(dictionarieValueModels)){
                 for (DictionarieValueModel dictionarieValueModel : dictionarieValueModels) {

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

@@ -9,6 +9,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -3598,6 +3599,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, records);
             result.getRecords().forEach(i -> {
                 i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
+                i.put("productPhoto", JSONArray.parseArray(i.getString("productPhoto")));
+                i.put("cylinderStampAttachment", JSONArray.parseArray(i.getString("cylinderStampAttachment")));
+                i.put("informationSituation",InformationManageTypeEnum.getName(i.getString("informationSituation")));
             });
             return result;
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/InformationManageTypeEnum.java

@@ -13,6 +13,7 @@ public enum InformationManageTypeEnum {
      */
     TYPE_QR_CODE("1", "二维码"),
     TYPE_STAMP("2", "电子标签"),
+    TYPE_OTHER("2", "其他"),
     TYPE_NO("99", "无");
 
     private String code;