低电压分析表修改

src/main/java/com/minpay/reportManage/action/ReportManageAction.java

@@ -690,17 +690,25 @@ public class ReportManageAction implements IMINAction {
 			child.put("zlwcsj", ddyFxb.getZlwcsj());
 			child.put("sfxc", ddyFxb.getSfxc());
 
+			int af = 0;
 			for (int i = 0; i < detailList.size(); i++) {
 				// 分析表id一致
 				if (ddyFxb.getId().equals(detailList.get(i).getFxbId())) {
 					String sjrq = detailList.get(i).getDate();
 					child.put(sjrq, detailList.get(i).getSc());
+					if(af > -1){
+						if(CommonUtil.isNotEmpty(ddyFxb.getZlwcsj()) & CommonUtil.isNotEmpty(detailList.get(i).getDate())){
+							af = DateUtil.DateCompare(ddyFxb.getZlwcsj(),detailList.get(i).getDate());
+						}
+					}
+					//判断是否在治理完成时间后又出现低电压情况
 					detailList.remove(i);
 					i --;
 				} else {
 					break;
 				}
 			}
+			child.put("af", CommonUtil.objToString(af));
 			resList.add(child);
 		}
 		res.set(IMINBusinessConstant.F_PAGING_LAY, resList);
@@ -897,14 +905,16 @@ public class ReportManageAction implements IMINAction {
 		for (int i = 0; i < list.size(); i ++) {
 			Map<String, String> map = list.get(i);
 			DwDdyFxb ddyFxb = new DwDdyFxb();
-			ddyFxb.setId(map.get("ID"));
+//			ddyFxb.setId(map.get("ID"));
 			ddyFxb.setDdyzymc(map.get("DDYZYMC"));
 			ddyFxb.setJtyy(map.get("JTYY"));
 			ddyFxb.setZlcs(map.get("ZLCS"));
 			ddyFxb.setSfzl(map.get("SFZL"));
 			ddyFxb.setZlwcsj(map.get("ZLWCSJ"));
-			ddyFxb.setSfxc(map.get("SFXC"));
-			db.updateByPrimaryKeySelective(DwDdyFxbMapper.class, ddyFxb);
+//			ddyFxb.setSfxc(map.get("SFXC"));
+			DwDdyFxbExample ddyFxbExample = new DwDdyFxbExample();
+			ddyFxbExample.createCriteria().andTqidEqualTo(map.get("TQID")).andYhbhEqualTo(map.get("YHBH"));
+			db.getMybatisMapper(DwDdyFxbMapper.class).updateByExampleSelective(ddyFxb,ddyFxbExample);
 		}
 
 		return res;

src/main/webapp/admin/ddy/reportManageDetailDdy.html

@@ -135,23 +135,32 @@
 			,page: true //开启分页
 			,cols: [cols]
 			,done: function(res, curr, count){
+			    debugger;
 			    //低电压时长大于48的数据，标黄
 				var zmyyhsjs = $("tbody").find('td[data-field="yhbh"]');
                 var ddysjTds = $("tbody").find('td[data-field="ddysj"]');
+                //治理完成时间
+                var zlwcsjs = $("tbody").find('td[data-field="zlwcsj"]');
                 //取结束时间
                 var ee  = strToDate(dayInterval.split("-")[1]);
                 var nowDataSj = $("tbody").find('td[data-field="' + dateToString(ee)+'"]');
-
+                var data = res.data;
                 for (var i = 0; i < ddysjTds.length; i ++) {
 					var ddysjTd = ddysjTds[i];
 					var zmyyhsj = zmyyhsjs[i]
                     var nowSj = nowDataSj[i];
-
+                    var zlwcsj = zlwcsjs[i];
+                    var zlsj = $(zlwcsj).find("div").html();//治理时间
 					var ddysj = $(ddysjTd).find("div").html();//总低电压时长
                     var nowSjs = $(nowSj).find("div").html();//今天低电压时长
                     if( ! nowSjs ) {
                         nowSjs = "0";
                     }
+                    if(!isEmpty(zlsj)){
+                       if(parseInt(data[i].af)<0){
+                           $(zlwcsj).css("background-color", "#ff0000");
+                       }
+                    }
                     if (parseInt(ddysj) >= 48) {//背景色-标黄-总数大于48小时
 						$(zmyyhsj).css("background-color", "rgb(233, 167, 41)");
 					}else if( 15 <= parseInt(ddysj) && parseInt(ddysj) < 48) {//背景色-标粉-15~48