Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
f8405f1a 由 张雷
选项

能耗分析问题修改

1 个父辈 6a8a31c0
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 141 行增加 和 55 行删除
sk-module-biz/src/main/java/com/skua/modules/material/controller/MaterialInformationController.java
...@@ -77,17 +77,17 @@ public class MaterialInformationController { ...@@ -77,17 +77,17 @@ public class MaterialInformationController {
77 @AutoLog(value = "厂区资料管理-分页列表查询") 77 @AutoLog(value = "厂区资料管理-分页列表查询")
78 @ApiOperation(value = "厂区资料管理-分页列表查询", notes = "厂区资料管理-分页列表查询") 78 @ApiOperation(value = "厂区资料管理-分页列表查询", notes = "厂区资料管理-分页列表查询")
79 @GetMapping(value = "/list") 79 @GetMapping(value = "/list")
80 public Result<IPage<MaterialInformation>> queryPageList(MaterialInformation MaterialInformation, 80 public Result<IPage<MaterialInformation>> queryPageList(MaterialInformation materialInformation,
81 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, 81 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
82 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, 82 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
83 HttpServletRequest req) { 83 HttpServletRequest req) {
84 Result<IPage<MaterialInformation>> result = new Result<IPage<MaterialInformation>>(); 84 Result<IPage<MaterialInformation>> result = new Result<IPage<MaterialInformation>>();
85 QueryWrapper<MaterialInformation> queryWrapper = QueryGenerator.initQueryWrapper(MaterialInformation, req.getParameterMap()); 85 // QueryWrapper<MaterialInformation> queryWrapper = QueryGenerator.initQueryWrapper(MaterialInformation, req.getParameterMap());
86 Page<MaterialInformation> page = new Page<MaterialInformation>(pageNo, pageSize); 86 Page<MaterialInformation> page = new Page<MaterialInformation>(pageNo, pageSize);
87 if (StringUtils.isBlank(MaterialInformation.getDepartId())&&StringUtils.isNotBlank(BaseContextHandler.getDeparts())) { 87 // if (StringUtils.isBlank(MaterialInformation.getDepartId())&&StringUtils.isNotBlank(BaseContextHandler.getDeparts())) {
88 queryWrapper.in("depart_id", BaseContextHandler.getDeparts().split(",")); 88 // queryWrapper.in("depart_id", BaseContextHandler.getDeparts().split(","));
89 } 89 // }
90 IPage<MaterialInformation> pageList = MaterialInformationService.page(page, queryWrapper); 90 IPage<MaterialInformation> pageList = MaterialInformationService.getPage(page, materialInformation);
91 result.setSuccess(true); 91 result.setSuccess(true);
92 result.setResult(pageList); 92 result.setResult(pageList);
93 return result; 93 return result;
...@@ -143,7 +143,7 @@ public class MaterialInformationController { ...@@ -143,7 +143,7 @@ public class MaterialInformationController {
143 143
144 return result; 144 return result;
145 } 145 }
146 146
147 /** 147 /**
148 * <pre> 148 * <pre>
149 * 更新浏览量/下载量 149 * 更新浏览量/下载量
...@@ -316,7 +316,7 @@ public class MaterialInformationController { ...@@ -316,7 +316,7 @@ public class MaterialInformationController {
316 result.setResult(pageList); 316 result.setResult(pageList);
317 return result; 317 return result;
318 } 318 }
319 319
320 @AutoLog(value = "厂区资料管理-流量统计") 320 @AutoLog(value = "厂区资料管理-流量统计")
321 @ApiOperation(value = "厂区资料管理-流量统计", notes = "厂区资料管理-流量统计") 321 @ApiOperation(value = "厂区资料管理-流量统计", notes = "厂区资料管理-流量统计")
322 @GetMapping(value = "/flowStatistics") 322 @GetMapping(value = "/flowStatistics")
...@@ -330,5 +330,5 @@ public class MaterialInformationController { ...@@ -330,5 +330,5 @@ public class MaterialInformationController {
330 result.setResult(pageList); 330 result.setResult(pageList);
331 return result; 331 return result;
332 } 332 }
333 333
334 } 334 }
......
sk-module-biz/src/main/java/com/skua/modules/material/mapper/MaterialInformationMapper.java
...@@ -3,6 +3,7 @@ package com.skua.modules.material.mapper; ...@@ -3,6 +3,7 @@ package com.skua.modules.material.mapper;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 import com.skua.tool.annotation.Anonymous;
6 import org.apache.ibatis.annotations.Param; 7 import org.apache.ibatis.annotations.Param;
7 8
8 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 9 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...@@ -28,4 +29,7 @@ public interface MaterialInformationMapper extends BaseMapper<MaterialInformatio ...@@ -28,4 +29,7 @@ public interface MaterialInformationMapper extends BaseMapper<MaterialInformatio
28 * @Description: TODO(这里描述这个方法的需求变更情况) 29 * @Description: TODO(这里描述这个方法的需求变更情况)
29 */ 30 */
30 List<Map<String, Object>> flowStatistics(String departId, String startTime, String endTime); 31 List<Map<String, Object>> flowStatistics(String departId, String startTime, String endTime);
32
33 @Anonymous
34 List<MaterialInformation> getListByType(@Param("facInformationtype") String facInformationtype);
31 } 35 }
......
sk-module-biz/src/main/java/com/skua/modules/material/mapper/xml/MaterialInformationMapper.xml
...@@ -53,5 +53,11 @@ ...@@ -53,5 +53,11 @@
53 GROUP BY 53 GROUP BY
54 b.create_time,b.handle_type 54 b.create_time,b.handle_type
55 </select> 55 </select>
56 <select id="getListByType" resultType="com.skua.modules.material.entity.MaterialInformation">
57 select * from material_information where 1=1
58 <if test="facInformationtype!=null and facInformationtype!=''">
59 AND fac_informationtype = #{facInformationtype}
60 </if>
61 </select>
56 62
57 </mapper> 63 </mapper>
......
sk-module-biz/src/main/java/com/skua/modules/material/service/IMaterialInformationService.java
...@@ -3,6 +3,8 @@ package com.skua.modules.material.service; ...@@ -3,6 +3,8 @@ package com.skua.modules.material.service;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 import com.baomidou.mybatisplus.core.metadata.IPage;
7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.baomidou.mybatisplus.extension.service.IService; 8 import com.baomidou.mybatisplus.extension.service.IService;
7 import com.skua.modules.material.entity.MaterialInformation; 9 import com.skua.modules.material.entity.MaterialInformation;
8 10
...@@ -12,6 +14,13 @@ import com.skua.modules.material.entity.MaterialInformation; ...@@ -12,6 +14,13 @@ import com.skua.modules.material.entity.MaterialInformation;
12 public interface IMaterialInformationService extends IService<MaterialInformation> { 14 public interface IMaterialInformationService extends IService<MaterialInformation> {
13 15
14 /** 16 /**
17 * 分页列表
18 * @param page
19 * @param materialInformation
20 * @return
21 */
22 IPage<MaterialInformation> getPage(Page<MaterialInformation> page, MaterialInformation materialInformation);
23 /**
15 * 24 *
16 * @Description 根据用户id查询所属厂区 只要第一个 25 * @Description 根据用户id查询所属厂区 只要第一个
17 * @Date 2021-07-27 15:03 26 * @Date 2021-07-27 15:03
...@@ -40,4 +49,5 @@ public interface IMaterialInformationService extends IService<MaterialInformatio ...@@ -40,4 +49,5 @@ public interface IMaterialInformationService extends IService<MaterialInformatio
40 * @Description: TODO(这里描述这个方法的需求变更情况) 49 * @Description: TODO(这里描述这个方法的需求变更情况)
41 */ 50 */
42 List<Map<String, Object>> flowStatistics(String departId, String startTime, String endTime); 51 List<Map<String, Object>> flowStatistics(String departId, String startTime, String endTime);
52
43 } 53 }
......
sk-module-biz/src/main/java/com/skua/modules/material/service/impl/MaterialInformationServiceImpl.java
...@@ -5,6 +5,10 @@ import java.util.HashMap; ...@@ -5,6 +5,10 @@ import java.util.HashMap;
5 import java.util.List; 5 import java.util.List;
6 import java.util.Map; 6 import java.util.Map;
7 7
8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
9 import com.baomidou.mybatisplus.core.metadata.IPage;
10 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
11 import com.skua.modules.edu.entity.QuestionOption;
8 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
9 13
10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 14 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -25,7 +29,15 @@ public class MaterialInformationServiceImpl extends ServiceImpl<MaterialInformat ...@@ -25,7 +29,15 @@ public class MaterialInformationServiceImpl extends ServiceImpl<MaterialInformat
25 return baseMapper.getAnalysis(facInformation); 29 return baseMapper.getAnalysis(facInformation);
26 } 30 }
27 31
28 @Override 32 @Override
33 public IPage<MaterialInformation> getPage(Page<MaterialInformation> page, MaterialInformation materialInformation) {
34 List<MaterialInformation> list = baseMapper.getListByType(materialInformation.getFacInformationtype());
35 page.setRecords(list);
36 page.setTotal(list.size());
37 return page;
38 }
39
40 @Override
29 public String queryFacByUserId(String userCode) { 41 public String queryFacByUserId(String userCode) {
30 return baseMapper.queryFacByUserId(userCode); 42 return baseMapper.queryFacByUserId(userCode);
31 } 43 }
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/FCustomReportDatasetMapper.java
...@@ -74,7 +74,8 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData ...@@ -74,7 +74,8 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
74 * @return 74 * @return
75 * @author Li Yuanyuan, 2020年9月27日 上午11:19:41 75 * @author Li Yuanyuan, 2020年9月27日 上午11:19:41
76 */ 76 */
77 List<Map<String, Object>> queryReportValue(@Param(value="dataViewName") String dataViewName,@Param(value="startTime") String startTime,@Param(value="endTime") String endTime,@Param(value="departId") String departId); 77 List<Map<String, Object>> queryReportValue(@Param(value="dataViewName") String dataViewName,
78 @Param(value="startTime") String startTime,@Param(value="endTime") String endTime,@Param(value="departId") String departId);
78 /** 79 /**
79 * <pre> 80 * <pre>
80 * 通过填报报表id删除 81 * 通过填报报表id删除
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -93,14 +93,15 @@ ...@@ -93,14 +93,15 @@
93 report_id = #{datasetId} 93 report_id = #{datasetId}
94 </select> 94 </select>
95 <select id="queryReportValue" parameterType="java.lang.String" resultType="java.util.HashMap"> 95 <select id="queryReportValue" parameterType="java.lang.String" resultType="java.util.HashMap">
96 select b.depart_name as depart_name,a.* from ${dataViewName} a left join view_sys_depart b on a.depart_id=b.id 96 select b.depart_name as depart_name,a.*
97 from view_sys_depart b
98 left join ${dataViewName} a on b.id = a.depart_id
97 where 1=1 99 where 1=1
98 <if test="departId!=null and departId!=''"> 100 <if test="departId!=null and departId!=''">
99 and a.depart_id in 101 and a.depart_id in
100 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")"> 102 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
101 #{item} 103 #{item}
102 </foreach> 104 </foreach>
103
104 </if> 105 </if>
105 order by b.area_order,b.depart_order,a.time 106 order by b.area_order,b.depart_order,a.time
106 </select> 107 </select>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/PowerAnalysisNewMapper.java
...@@ -22,39 +22,52 @@ public interface PowerAnalysisNewMapper { ...@@ -22,39 +22,52 @@ public interface PowerAnalysisNewMapper {
22 22
23 void deleteOperationMonth(@Param("factoryId") String factoryId, @Param("time") String time); 23 void deleteOperationMonth(@Param("factoryId") String factoryId, @Param("time") String time);
24 24
25 Map totalPowerConsumptionAnalysis(@Param(value="thisDataViewName") String thisDataViewName,@Param(value="lastDataViewName") String lastDataViewName,@Param("thisMonth") String thisMonth, @Param("lastMonth") String lastMonth, @Param("factoryIds") String factoryIds); 25 Map totalPowerConsumptionAnalysis(@Param(value="thisDataViewName3a24") String thisDataViewName3a24,@Param(value="thisDataViewName2119") String thisDataViewName2119,
26 @Param(value="lastDataViewName3a24") String lastDataViewName3a24,@Param(value="lastDataViewName2119") String lastDataViewName2119,
27 @Param("thisMonth") String thisMonth, @Param("lastMonth") String lastMonth, @Param("factoryIds") String factoryIds);
26 28
27 List<Map> querySixMonthPowerConsumption(@Param(value="dataViewName") String dataViewName,@Param("thisMonth") String thisMonth, @Param("endTime") String endTime, @Param("factoryIds") String factoryIds); 29 List<Map> querySixMonthPowerConsumption(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
30 @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("factoryIds") String factoryIds);
28 31
29 List<Map<String, Object>> powerConsumptionDistribution(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("factoryIds") String factoryIds); 32 List<Map<String, Object>> powerConsumptionDistribution(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
33 @Param("time") String time, @Param("factoryIds") String factoryIds);
30 34
31 List<Map<String, Object>> queryCraftDSDH(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("factoryIds") String factoryIds); 35 List<Map<String, Object>> queryCraftDSDH(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
36 @Param("time") String time, @Param("factoryIds") String factoryIds);
32 37
33 List<Map<String, Object>> queryStandardDSDH(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("factoryIds") String factoryIds); 38 List<Map<String, Object>> queryStandardDSDH(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
39 @Param("time") String time, @Param("factoryIds") String factoryIds);
34 40
35 List<Map<String, Object>> queryScaleDSDH(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("factoryIds") String factoryIds); 41 List<Map<String, Object>> queryScaleDSDH(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
42 @Param("time") String time, @Param("factoryIds") String factoryIds);
36 43
37 List<Map<String, Object>> queryCraftDSDHCurve(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("id") String id, @Param("factoryIds") String factoryIds); 44 List<Map<String, Object>> queryCraftDSDHCurve(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
45 @Param("time") String time, @Param("id") String id, @Param("factoryIds") String factoryIds);
38 46
39 List<Map<String, Object>> queryStandardDSDHCurve(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("id") String id, @Param("factoryIds") String factoryIds); 47 List<Map<String, Object>> queryStandardDSDHCurve(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
48 @Param("time") String time, @Param("id") String id, @Param("factoryIds") String factoryIds);
40 49
41 List<Map<String, Object>> queryScaleDSDHCurve(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("start") String start, @Param("end") String end, @Param("factoryIds") String factoryIds); 50 List<Map<String, Object>> queryScaleDSDHCurve(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
51 @Param("time") String time, @Param("start") String start, @Param("end") String end, @Param("factoryIds") String factoryIds);
42 52
43 List<Map<String, Object>> queryDataByCodeAndtime(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("factoryId")String factoryId, @Param("code") String code); 53 List<Map<String, Object>> queryDataByCodeAndtime(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("factoryId")String factoryId, @Param("code") String code);
44 54
45 List<Map<String, Object>> queryHDLAndSL(@Param(value="dataViewName") String dataViewName,@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("factoryId")String factoryId); 55 List<Map<String, Object>> queryHDLAndSL(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
56 @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("factoryId")String factoryId);
46 57
47 List<Map<String, Object>> powerConsumptionDistributionList(@Param(value="dataViewName") String dataViewName,@Param("time") String time, @Param("start") String start, @Param("end") String end, @Param("factoryIds") String factoryIds); 58 List<Map<String, Object>> powerConsumptionDistributionList(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
59 @Param("time") String time, @Param("start") String start, @Param("end") String end, @Param("factoryIds") String factoryIds);
48 60
49 List<Map<String, Object>> queryDataByCodeAndtimeFac(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("factoryId") String factoryId ,@Param("code") String code); 61 List<Map<String, Object>> queryDataByCodeAndtimeFac(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("factoryId") String factoryId ,@Param("code") String code);
50 62
51 List<Map> queryHDLAndSLByFac(@Param(value="dataViewName") String dataViewName,@Param("startTime") String startTime, @Param("endTime") String endTime ,@Param("factoryId")String factoryId); 63 List<Map> queryHDLAndSLByFac(@Param(value="dataViewName3a24") String dataViewName3a24,@Param(value="dataViewName2119") String dataViewName2119,
64 @Param("startTime") String startTime, @Param("endTime") String endTime ,@Param("factoryId")String factoryId);
52 65
53 List<Map<String, Object>> queryView3771(@Param("time") String time); 66 List<Map<String, Object>> queryMonthHDLData(@Param("dataViewName3a24") String dataViewName3a24,@Param("parentId") String parentId);
54 67
55 List<Map<String, Object>> queryMonthHDLData(@Param("dataViewName") String dataViewName,@Param("parentId") String parentId); 68 List<Map<String, String>> queryHDLByYear(@Param("dataViewName3a24") String dataViewName3a24,@Param("dataViewName2119") String dataViewName2119,
69 @Param("factoryId") String factoryId);
56 70
57 List<Map<String, String>> queryHDLByYear(@Param("dataViewName") String dataViewName,@Param("factoryId") String factoryId); 71 List<Map<String, Object>> queryHDLDetails(@Param("dataViewName3a24") String dataViewName3a24,@Param("dataViewName2119") String dataViewName2119,
58 72 @Param("parentId") String parentId);
59 List<Map<String, Object>> queryHDLDetails(@Param("dataViewName") String dataViewName,@Param("parentId") String parentId);
60 } 73 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/IPowerAnalysisNewService.java
...@@ -41,7 +41,7 @@ public interface IPowerAnalysisNewService { ...@@ -41,7 +41,7 @@ public interface IPowerAnalysisNewService {
41 * @Param [startTime, endTime, factoryId] 41 * @Param [startTime, endTime, factoryId]
42 * @return java.util.Map<java.lang.String, java.lang.Object> 42 * @return java.util.Map<java.lang.String, java.lang.Object>
43 **/ 43 **/
44 Map<String, Object> powerCutDownByFac(String startTime, String endTime, String factoryId); 44 Map<String, Object> powerCutDownByFac(String startTime, String endTime, String departId);
45 45
46 /** 46 /**
47 * 47 *
...@@ -59,7 +59,7 @@ public interface IPowerAnalysisNewService { ...@@ -59,7 +59,7 @@ public interface IPowerAnalysisNewService {
59 * @Param [startTime, endTime, factoryId] 59 * @Param [startTime, endTime, factoryId]
60 * @return java.util.Map<java.lang.String, java.lang.Object> 60 * @return java.util.Map<java.lang.String, java.lang.Object>
61 **/ 61 **/
62 Map<String, Object> powerCutDownAllListByFac(String startTime, String endTime, String factoryId); 62 Map<String, Object> powerCutDownAllListByFac(String startTime, String endTime, String departId);
63 63
64 /** 64 /**
65 * 65 *
...@@ -68,7 +68,7 @@ public interface IPowerAnalysisNewService { ...@@ -68,7 +68,7 @@ public interface IPowerAnalysisNewService {
68 * @Param [startTime, endTime] 68 * @Param [startTime, endTime]
69 * @return java.util.Map<java.lang.String, java.lang.Object> 69 * @return java.util.Map<java.lang.String, java.lang.Object>
70 **/ 70 **/
71 Map<String, Object> powerConsumptionList(String startTime, String endTime,String factoryId); 71 Map<String, Object> powerConsumptionList(String startTime, String endTime,String departId);
72 72
73 /** 73 /**
74 * 74 *
...@@ -77,7 +77,7 @@ public interface IPowerAnalysisNewService { ...@@ -77,7 +77,7 @@ public interface IPowerAnalysisNewService {
77 * @Param [startTime, endTime, factoryId] 77 * @Param [startTime, endTime, factoryId]
78 * @return java.util.Map<java.lang.String, java.lang.Object> 78 * @return java.util.Map<java.lang.String, java.lang.Object>
79 **/ 79 **/
80 Map<String, Object> powerCutDownListByFac(String startTime, String endTime, String factoryId); 80 Map<String, Object> powerCutDownListByFac(String startTime, String endTime, String departId);
81 81
82 /** 82 /**
83 * <pre> 83 * <pre>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
...@@ -519,51 +519,90 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -519,51 +519,90 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
519 String time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat); 519 String time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
520 xlist.add(time); 520 xlist.add(time);
521 String jscod; 521 String jscod;
522 if (!org.apache.commons.lang3.StringUtils.isEmpty(jscod = fieldsMap.get("JSCOD"))) { 522 if (!StringUtils.isEmpty(jscod = fieldsMap.get("JSCOD"))) {
523 jscodList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jscod).toString()),2)); 523 if(map1.get(jscod)!=null){
524 524 jscodList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jscod).toString()),2));
525 }else{
526 jscodList.add(0.00);
527 }
525 } 528 }
526 String jsnh3n; 529 String jsnh3n;
527 if (!org.apache.commons.lang3.StringUtils.isEmpty(jsnh3n = fieldsMap.get("JSNH3N"))) { 530 if (!StringUtils.isEmpty(jsnh3n = fieldsMap.get("JSNH3N"))) {
528 jsadList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsnh3n).toString()),2)); 531 if(map1.get(jsnh3n)!=null){
532 jsadList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsnh3n).toString()),2));
533 }else{
534 jsadList.add(0.00);
535 }
529 } 536 }
530 String jstn; 537 String jstn;
531 if (!org.apache.commons.lang3.StringUtils.isEmpty(jstn = fieldsMap.get("JSTN"))) { 538 if (!StringUtils.isEmpty(jstn = fieldsMap.get("JSTN"))) {
532 jstnList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jstn).toString()),2)); 539 if(map1.get(jstn)!=null){
540 jstnList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jstn).toString()),2));
541 }else{
542 jstnList.add(0.00);
543 }
533 } 544 }
534 String jstp; 545 String jstp;
535 if (!org.apache.commons.lang3.StringUtils.isEmpty(jstp = fieldsMap.get("JSTP"))) { 546 if (!StringUtils.isEmpty(jstp = fieldsMap.get("JSTP"))) {
536 jstpList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jstp).toString()),2)); 547 if(map1.get(jstp)!=null){
548 jstpList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jstp).toString()),2));
549 }else{
550 jstpList.add(0.00);
551 }
537 } 552 }
538 553
539 String jsph; 554 String jsph;
540 if (!org.apache.commons.lang3.StringUtils.isEmpty(jsph = fieldsMap.get("JSPH"))) { 555 if (!StringUtils.isEmpty(jsph = fieldsMap.get("JSPH"))) {
541 jsphList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsph).toString()),2)); 556 if(map1.get(jsph)!=null){
557 jsphList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsph).toString()),2));
558 }else{
559 jsphList.add(0.00);
560 }
542 } 561 }
543 562
544 String cscod; 563 String cscod;
545 if (!org.apache.commons.lang3.StringUtils.isEmpty(cscod = fieldsMap.get("CSCOD"))) { 564 if (!StringUtils.isEmpty(cscod = fieldsMap.get("CSCOD"))) {
546 cscodList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cscod).toString()),2)); 565 if(map1.get(cscod)!=null){
566 cscodList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cscod).toString()),2));
567 }else{
568 cscodList.add(0.00);
569 }
547 } 570 }
548 571
549 String csnh3n; 572 String csnh3n;
550 if (!org.apache.commons.lang3.StringUtils.isEmpty(csnh3n = fieldsMap.get("CSNH3N"))) { 573 if (!StringUtils.isEmpty(csnh3n = fieldsMap.get("CSNH3N"))) {
551 csadList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csnh3n).toString()),2)); 574 if(map1.get(csnh3n)!=null){
575 csadList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csnh3n).toString()),2));
576 }else{
577 csadList.add(0.00);
578 }
552 } 579 }
553 580
554 String cstn; 581 String cstn;
555 if (!org.apache.commons.lang3.StringUtils.isEmpty(cstn = fieldsMap.get("CSTN"))) { 582 if (!StringUtils.isEmpty(cstn = fieldsMap.get("CSTN"))) {
556 cstnList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cstn).toString()),2)); 583 if(map1.get(cstn)!=null){
584 cstnList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cstn).toString()),2));
585 }else{
586 cstnList.add(0.00);
587 }
557 } 588 }
558 589
559 String cstp; 590 String cstp;
560 if (!org.apache.commons.lang3.StringUtils.isEmpty(cstp = fieldsMap.get("CSTP"))) { 591 if (!StringUtils.isEmpty(cstp = fieldsMap.get("CSTP"))) {
561 cstpList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cstp).toString()),2)); 592 if(map1.get(cstp)!=null){
593 cstpList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cstp).toString()),2));
594 }else{
595 cstpList.add(0.00);
596 }
562 } 597 }
563 598
564 String csph; 599 String csph;
565 if (!StringUtils.isEmpty(csph = fieldsMap.get("CSPH"))) { 600 if (!StringUtils.isEmpty(csph = fieldsMap.get("CSPH"))) {
566 csphList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csph).toString()),2)); 601 if(map1.get(csph)!=null){
602 csphList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csph).toString()),2));
603 }else{
604 csphList.add(0.00);
605 }
567 } 606 }
568 } 607 }
569 } 608 }
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/IInspectionTaskFillContentService.java
...@@ -17,7 +17,7 @@ public interface IInspectionTaskFillContentService extends IService<InspectionTa ...@@ -17,7 +17,7 @@ public interface IInspectionTaskFillContentService extends IService<InspectionTa
17 17
18 List<Map<String, Object>> getInspectionPointHistoryByTaskId(String taskId); 18 List<Map<String, Object>> getInspectionPointHistoryByTaskId(String taskId);
19 19
20 Map<String,List<Map<String, Object>>> getInspectionHistoryFillGroupByInspectionPointId(String taskId, String inspectionPointId); 20 List<Map<String, Object>> getInspectionHistoryFillGroupByInspectionPointId(String taskId, String inspectionPointId);
21 21
22 List<Map<String, Object>> getInspectionHistoryByTaskId(String taskId); 22 List<Map<String, Object>> getInspectionHistoryByTaskId(String taskId);
23 23
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!