Commit 3b0af0b7 by hzc

bug修复

parent bbc068c4
...@@ -206,6 +206,8 @@ public class ShortboardRuleService { ...@@ -206,6 +206,8 @@ public class ShortboardRuleService {
List<String> compareObjs,String driveId,int date,String code) throws Exception{ List<String> compareObjs,String driveId,int date,String code) throws Exception{
String type = shortboardItem.getType(); String type = shortboardItem.getType();
List<DriveIndCalResultDef> result = new ArrayList<>(); List<DriveIndCalResultDef> result = new ArrayList<>();
if("0".equals(type)) {//均值 if("0".equals(type)) {//均值
result = this.selectAverageShortboard(shortboardItem, compareObjs, driveId, date, code); result = this.selectAverageShortboard(shortboardItem, compareObjs, driveId, date, code);
}else if("1".equals(type)) {//最大值 }else if("1".equals(type)) {//最大值
...@@ -233,8 +235,11 @@ public class ShortboardRuleService { ...@@ -233,8 +235,11 @@ public class ShortboardRuleService {
paramMap.put("date", date); paramMap.put("date", date);
paramMap.put("code", code); paramMap.put("code", code);
paramMap.put("compareObjs", compareObjs); paramMap.put("compareObjs", compareObjs);
List<DriveIndCalResultDef> calResults = driveIndCalResultDefMapper. List<DriveIndCalResultDef> calResults = driveIndCalResultDefMapper.
findByIndIdAndDateAndCompareObjIn(paramMap); findByIndIdAndDateAndCompareObjIn(paramMap);
for(DriveIndCalResultDef calResult : calResults) { for(DriveIndCalResultDef calResult : calResults) {
//判断规则选择是大于还是小于 //判断规则选择是大于还是小于
if("0".equals(shortboardItem.getCalType())) {//大于 if("0".equals(shortboardItem.getCalType())) {//大于
......
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
insert into short_board_record( insert into short_board_record(
shortboard_unit_id, compare_obj, drive_id, drive_name, value, date, compare_cal_result_json, shortboard_unit_id, compare_obj, drive_id, drive_name, value, date, compare_cal_result_json,
shortboard_rule_ids, shortboard_name, shortboard_desc, shortboard_type, is_issue, code, shortboard_rule_ids, shortboard_name, shortboard_desc, shortboard_type, is_issue, code,
last_updater, last_update_time) last_updater, last_update_time,unit_name,user_id,department,drive_path)
values values
<foreach collection="datas" item="val" separator=","> <foreach collection="datas" item="val" separator=",">
( (
#{val.shortboardUnitId}, #{val.compareObj}, #{val.driveId}, #{val.driveName}, #{val.value}, #{val.shortboardUnitId}, #{val.compareObj}, #{val.driveId}, #{val.driveName}, #{val.value},
#{val.date},#{val.compareCalResultJson},#{val.shortboardRuleIds},#{val.shortboardName}, #{val.date},#{val.compareCalResultJson},#{val.shortboardRuleIds},#{val.shortboardName},
#{val.shortboardDesc},#{val.shortboardType},#{val.isIssue},#{val.code},#{val.lastUpdater}, #{val.shortboardDesc},#{val.shortboardType},#{val.isIssue},#{val.code},#{val.lastUpdater},
#{val.lastUpdateTime} #{val.lastUpdateTime},#{val.unitName},#{val.userId},#{val.department},#{val.drivePath}
) )
</foreach> </foreach>
</insert> </insert>
......
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