工业水池导出

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -26,23 +26,24 @@
                (case r.resource_type
                     when 'crane' then rc.status
                     when 'pool' then rp.status
+                    when 'industryPool' then rp.status
                     when 'natural' then rn.status end)                                              status,
-               (case r.resource_type when 'crane' then rc.section when 'pool' then rp.section end) section,
+               (case r.resource_type when 'crane' then rc.section when 'pool' then rp.section when 'industryPool' then rp.section end) section,
                (case r.resource_type when 'crane' then rc.pipe_network when 'hydarant' then rh.pipe_network end) pipe_network,
-               (case r.resource_type when 'crane' then rc.pipe_type_name when 'hydarant' then rh.pipe_type_name when 'pool' then rp.pipe_type_name end) pipe_type_name,
+               (case r.resource_type when 'crane' then rc.pipe_type_name when 'hydarant' then rh.pipe_type_name when 'pool' then rp.pipe_type_name when 'industryPool' then rp.pipe_type_name end) pipe_type_name,
                (case r.resource_type when 'crane' then rc.pipe_diameter when 'hydarant' then rh.pipe_diameter end) pipe_diameter,
                rc.inlet_pipe_diameter,
                rc.outlet_pipe_diameter,
                rc.waterfilling_lane_num,
-               (case r.resource_type when 'crane' then rc.water_supply_name when 'hydarant' then rh.water_supply_name when 'pool' then rp.water_supply_name end) water_supply_name,
+               (case r.resource_type when 'crane' then rc.water_supply_name when 'hydarant' then rh.water_supply_name when 'pool' then rp.water_supply_name when 'industryPool' then rp.water_supply_name end) water_supply_name,
                (case when 'hydrant' then rh.type when 'natural' then rn.type end) type,
                rh.system_type,
                rh.facilities_category,
                rh.road_junction_info,
                rh.place_form,
                rh.hose_connection,
-               (case r.resource_type when 'hydrant' then rh.intake_form when 'pool' then rp.intake_form end) intake_form,
-               (case r.resource_type when 'natural' then rn.volume when 'pool' then rp.volume end) volume,
+               (case r.resource_type when 'hydrant' then rh.intake_form when 'pool' then rp.intake_form  when 'industryPool' then rp.intake_form end) intake_form,
+               (case r.resource_type when 'natural' then rn.volume when 'pool' then rp.volume when 'industryPool' then rp.volume end) volume,
                rn.area,
                rn.quality_situation_info,
                rn.season_change_info,
@@ -56,7 +57,10 @@
                ri.iot_water_storage,
                ri.iot_flow_rate,
                ri.iot_status,
-               ri.iot_pipe_pressure
+               ri.iot_pipe_pressure,
+               rp.min_water_level,
+               rp.max_water_level,
+               rp.level_device_name
         from cb_water_resource r
             left join cb_water_resource_pool rp
         on r.sequence_nbr = rp.resource_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -237,7 +237,7 @@ public class ExcelServiceImpl {
 			break;
 		case "SYXX":
 			// 暂时先还原代码不加 “非” ，为修改bug http://36.46.149.14:5080/zentao/task-view-6974.html 水源导出没有数据问题
-			if(authFalg) {
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						WaterResourceDto.class, dataSourcesImpl, false);
 				break;
@@ -1285,7 +1285,7 @@ public class ExcelServiceImpl {
 				item.setTypeCode(type[1]);
 			}
 			if (item.getLevelDeviceName() != null) {
-				String[] type = item.getType().split("@");
+				String[] type = item.getLevelDeviceName().split("@");
 				item.setLevelDeviceName(type[0]);
 				item.setLevelDeviceId(Long.valueOf(type[1]));
 			}