Skip to content

A
amos-boot-biz
Commit 1603d4f0 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

气瓶数据项调整 / 使用登记页面调整

parent c35e0bf4
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 11 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 1603d4f0
...@@ -940,21 +940,21 @@ ...@@ -940,21 +940,21 @@
LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD" LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
</sql> </sql>
<select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
select * FROM ( <include refid="page-list-vessel"/> SELECT * FROM ( SELECT * FROM ( <include refid="page-list-vessel"/>
WHERE WHERE
ri."EQU_CATEGORY" = '2300' ri."EQU_CATEGORY" = '2300'
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1) and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
<if test="jsonObject.chargingMedium == null or jsonObject.chargingMedium == ''"> <if test="jsonObject.chargingMedium != null and jsonObject.chargingMedium != ''">
and pv."CHARGING_MEDIUM" like concat('%',#{jsonObject.chargingMedium},'%') and pv."CHARGING_MEDIUM" = #{jsonObject.chargingMedium}
</if> </if>
<if test="jsonObject.useInnerCode == null or jsonObject.useInnerCode == ''"> <if test="jsonObject.useInnerCode != null and jsonObject.useInnerCode != ''">
and ui."USE_INNER_CODE" like concat('%',#{jsonObject.useInnerCode},'%') and ui."USE_INNER_CODE" like concat('%',#{jsonObject.useInnerCode},'%')
</if> </if>
<if test="jsonObject.informationSituation == null or jsonObject.informationSituation == ''"> <if test="jsonObject.informationSituation != null and jsonObject.informationSituation != ''">
and oi.INFORMATION_SITUATION =#{jsonObject.informationSituation} and oi.INFORMATION_SITUATION =#{jsonObject.informationSituation}
</if> </if>
<if test="jsonObject.informationManageCode == null or jsonObject.informationManageCode == ''"> <if test="jsonObject.informationManageCode != null and jsonObject.informationManageCode != ''">
and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%') and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%')
</if> </if>
<if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''"> <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
...@@ -997,24 +997,37 @@ ...@@ -997,24 +997,37 @@
ORDER BY ui.REC_DATE DESC ORDER BY ui.REC_DATE DESC
) aa ) aa
<where> <where>
<if test="jsonObject.equDefineName == null or jsonObject.equDefineName == ''"> <if test="jsonObject.equDefineName != null and jsonObject.equDefineName != ''">
and aa.equDefineName like concat('%',#{jsonObject.equDefineName},'%') and aa.equDefineName like concat('%',#{jsonObject.equDefineName},'%')
</if> </if>
<if test="jsonObject.factoryNum == null or jsonObject.factoryNum == ''"> <if test="jsonObject.factoryNum != null and jsonObject.factoryNum != ''">
and aa.factoryNum like concat('%',#{jsonObject.factoryNum},'%') and aa.factoryNum like concat('%',#{jsonObject.factoryNum},'%')
</if> </if>
<if test="jsonObject.nextInspectDate == null or jsonObject.nextInspectDate == ''"> <if test="jsonObject.nextInspectDate != null and jsonObject.nextInspectDate != ''">
and aa.nextInspectDate =#{jsonObject.nextInspectDate} and aa.nextInspectDate =#{jsonObject.nextInspectDate}
</if> </if>
</where> </where>
)
</select> </select>
<select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-vessel"/> SELECT * FROM ( SELECT * FROM ( <include refid="page-list-vessel"/>
WHERE WHERE
ri."EQU_DEFINE" = '23T0' ri."EQU_DEFINE" = '23T0'
and ui."DATA_SOURCE" like 'jg_his%' and ui."DATA_SOURCE" like 'jg_his%'
and ri.whether_vehicle_cylinder = 1 and ri.whether_vehicle_cylinder = 1
<if test="jsonObject.chargingMedium != null and jsonObject.chargingMedium != ''">
and pv."CHARGING_MEDIUM" = #{jsonObject.chargingMedium}
</if>
<if test="jsonObject.useInnerCode != null and jsonObject.useInnerCode != ''">
and ui."USE_INNER_CODE" like concat('%',#{jsonObject.useInnerCode},'%')
</if>
<if test="jsonObject.informationSituation != null and jsonObject.informationSituation != ''">
and oi.INFORMATION_SITUATION =#{jsonObject.informationSituation}
</if>
<if test="jsonObject.informationManageCode != null and jsonObject.informationManageCode != ''">
and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%')
</if>
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备 -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null"> <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode} and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
...@@ -1034,14 +1047,39 @@ ...@@ -1034,14 +1047,39 @@
!='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' ) !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
</if> </if>
ORDER BY ui.REC_DATE DESC ORDER BY ui.REC_DATE DESC
) aa
<where>
<if test="jsonObject.equDefineName != null and jsonObject.equDefineName != ''">
and aa.equDefineName like concat('%',#{jsonObject.equDefineName},'%')
</if>
<if test="jsonObject.factoryNum != null and jsonObject.factoryNum != ''">
and aa.factoryNum like concat('%',#{jsonObject.factoryNum},'%')
</if>
<if test="jsonObject.nextInspectDate != null and jsonObject.nextInspectDate != ''">
and aa.nextInspectDate =#{jsonObject.nextInspectDate}
</if>
</where>
)
</select> </select>
<select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-vessel"/> SELECT * FROM ( SELECT * FROM ( <include refid="page-list-vessel"/>
WHERE WHERE
ri."EQU_DEFINE" = '23T0' ri."EQU_DEFINE" = '23T0'
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
and ui."DATA_SOURCE" not like 'jg_his%' and ui."DATA_SOURCE" not like 'jg_his%'
and ri.whether_vehicle_cylinder = 1 and ri.whether_vehicle_cylinder = 1
<if test="jsonObject.chargingMedium != null and jsonObject.chargingMedium != ''">
and pv."CHARGING_MEDIUM" = #{jsonObject.chargingMedium}
</if>
<if test="jsonObject.useInnerCode != null and jsonObject.useInnerCode != ''">
and ui."USE_INNER_CODE" like concat('%',#{jsonObject.useInnerCode},'%')
</if>
<if test="jsonObject.informationSituation != null and jsonObject.informationSituation != ''">
and oi.INFORMATION_SITUATION =#{jsonObject.informationSituation}
</if>
<if test="jsonObject.informationManageCode != null and jsonObject.informationManageCode != ''">
and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%')
</if>
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备 -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null"> <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode} and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
...@@ -1055,6 +1093,19 @@ ...@@ -1055,6 +1093,19 @@
!='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' ) !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
</if> </if>
ORDER BY ui.REC_DATE DESC ORDER BY ui.REC_DATE DESC
) aa
<where>
<if test="jsonObject.equDefineName != null and jsonObject.equDefineName != ''">
and aa.equDefineName like concat('%',#{jsonObject.equDefineName},'%')
</if>
<if test="jsonObject.factoryNum != null and jsonObject.factoryNum != ''">
and aa.factoryNum like concat('%',#{jsonObject.factoryNum},'%')
</if>
<if test="jsonObject.nextInspectDate != null and jsonObject.nextInspectDate != ''">
and aa.nextInspectDate =#{jsonObject.nextInspectDate}
</if>
</where>
)
</select> </select>
<select id="queryForUnitVesselEquipment" resultType="java.util.Map"> <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
<include refid="page-list-vessel"/> <include refid="page-list-vessel"/>
......
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
View file @ 1603d4f0
...@@ -3623,6 +3623,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -3623,6 +3623,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject); Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject);
result.getRecords().forEach(i -> { result.getRecords().forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))); 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; return result;
} }
...@@ -3642,6 +3645,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -3642,6 +3645,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePageHistory(page, jsonObject); Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePageHistory(page, jsonObject);
result.getRecords().forEach(i -> { result.getRecords().forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))); 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; return result;
} }
......
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/JgUseRegistrationServiceImpl.java
View file @ 1603d4f0
...@@ -2171,6 +2171,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2171,6 +2171,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records); List<Map<String, Object>> result = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
result.forEach(i -> { result.forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))); i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
i.put("productPhoto", JSONArray.parseArray((String) i.get("productPhoto")));
i.put("cylinderStampAttachment", JSONArray.parseArray((String) i.get("cylinderStampAttachment")));
i.put("informationSituation", InformationManageTypeEnum.getName((String) i.get("informationSituation")));
}); });
jsonObject.put("equipmentLists", result); jsonObject.put("equipmentLists", result);
} }
......
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/UseRegisterUpdateService.java
View file @ 1603d4f0
package com.yeejoin.amos.boot.module.jg.biz.service.impl; package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -9,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration; ...@@ -9,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum; import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.InformationManageTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel; import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
...@@ -83,6 +85,9 @@ public class UseRegisterUpdateService { ...@@ -83,6 +85,9 @@ public class UseRegisterUpdateService {
List<Map<String, Object>> result = useRegistrationService.getBaseMapper().queryForUnitVesselEquipment(records); List<Map<String, Object>> result = useRegistrationService.getBaseMapper().queryForUnitVesselEquipment(records);
result.forEach(i -> { result.forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))); i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
i.put("productPhoto", JSONArray.parseArray((String) i.get("productPhoto")));
i.put("cylinderStampAttachment", JSONArray.parseArray((String) i.get("cylinderStampAttachment")));
i.put("informationSituation", InformationManageTypeEnum.getName((String) i.get("informationSituation")));
}); });
jsonObject.put("equipmentLists", result); jsonObject.put("equipmentLists", result);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment