功能优化

src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java

@@ -394,7 +394,7 @@ public class ReportServiceImpl implements IReportService {
 //					Object fzl = temp.get("DFD13_FZL");
 					String dataType = temp.get("DFD13_DATA_TYPE");
 					String key = temp.get("KEYSS");
-					if("3".equals(dataType)){//过载
+					if("3".equals(dataType)||"4".equals(dataType)){//过载
 						if(pbTemp.containsKey(key)){
 							continue;
 						}else{
@@ -405,7 +405,7 @@ public class ReportServiceImpl implements IReportService {
 							jo3.put("avg",ArithUtils.div(str.get("pjfzl"),str.get("xlts")));
 							ja3.add(jo3);
 						}
-					}else if("1".equals(dataType)){//重载
+					}else if("1".equals(dataType)||"2".equals(dataType)){//重载
 						if(pbTemp2.containsKey(key)){
 							continue;
 						}else{
@@ -487,9 +487,11 @@ public class ReportServiceImpl implements IReportService {
 			param.put("maxXlName2",maxXlName2);
 			//获取配变过载数据最大值
 			AuxiliaryTools.getMaxPbByParam(pbgzzList,param);
+			//查询电采暖数据
+			List<Map<String, String>> dcnsj = db.getMybatisMapper(IReportBatchMapper.class).selectDcnmx(map);
 			//获取配变重载数据最大值
-			rstMap.put("descStr",AuxiliaryTools.getXlgzzDesc(ja,ja2,param));
-			rstMap.put("descStr2",AuxiliaryTools.getXlPbgzzDesc(ja3,ja4,param));
+			rstMap.put("descStr",AuxiliaryTools.getXlgzzDesc(ja,ja2,param,dcnsj));
+			rstMap.put("descStr2",AuxiliaryTools.getXlPbgzzDesc(ja3,ja4,param,dcnsj));
 //			rstMap.put("descStr3",AuxiliaryTools.getQxgdDesc(jagd,param));
 
 		}

src/main/java/com/minpay/common/util/AuxiliaryTools.java

@@ -143,15 +143,21 @@ public class AuxiliaryTools {
      * @param ja3 过载
      * @param ja4 重载
      * @param param
+     * @param dcnsj
      * @return
      */
-    public static  List<String> getXlPbgzzDesc(JSONArray ja3, JSONArray ja4, Map<String, Object> param) {
+    public static  List<String> getXlPbgzzDesc(JSONArray ja3, JSONArray ja4, Map<String, Object> param,
+                                               List<Map<String, String>> dcnsj) {
         List<String> list = new ArrayList<String>();
         StringBuffer descStr = new StringBuffer();
         //过载
         String maxGb = StringUtil.ObjectToString(param.get("maxPbName1"));
         String avg = "";
+
         if(ja3 != null && !ja3.isEmpty()){
+            String tempXl = "",tempTq = "",tqs = "";
+            Map<String,String> tempDcn = new HashMap<String,String>();
+
             descStr.append("监测发现公变过载")
                     .append(ja3.size())
                     .append("个，");
@@ -160,9 +166,10 @@ public class AuxiliaryTools {
             for (int i = 0; i < size; i++) {
                 JSONObject jo = ja3.getJSONObject(i);
                 String key = jo.getString("KEYSS");
+                tempTq = jo.getString("DFD13_GBMC");
                 if(key.equals(maxGb)){
                     avg = jo.getString("avg");
-                    maxGb = jo.getString("DFD13_GBMC");
+                    maxGb = tempTq;
                 }
                 String unit = jo.getString("DFD13_UNIT");
                 if(temp.containsKey(unit)){
@@ -170,6 +177,12 @@ public class AuxiliaryTools {
                 }else{
                     temp.put(unit,1);
                 }
+                for (int j = 0; j < dcnsj.size(); j++) {
+                    tempDcn = dcnsj.get(j);
+                    if(tempTq != null && tempTq.equals(tempDcn.get("dcn_sjtq"))){
+                        tqs += tempDcn.get("dcn_sjtq") + ",";
+                    }
+                }
             }
             if(!temp.isEmpty()){
                 descStr.append("分别为");
@@ -182,20 +195,28 @@ public class AuxiliaryTools {
             descStr.append("其中").append(maxGb).append(",");
             descStr.append("过载时长最长" + StringUtil.ObjToFloat(param.get("maxPb1")) + "小时，平均负载率为" + avg + "%。")
                     .append("原因为:")
-                    .append(param.get("reason1"))
+                    .append(StringUtil.ObjectToString(param.get("reason1")))
                     .append("。")
                     .append("措施为:")
-                    .append(param.get("cs1"))
+                    .append(StringUtil.ObjectToString(param.get("cs1")))
                     .append("。");
-            descStr.append("不涉及电采暖线路。");
+            if (!"".equals(tqs)){
+                descStr.append("其中涉及电采暖台区分别为:").append(tqs.substring(0,tqs.lastIndexOf(","))).append("。");
+            }else{
+                descStr.append("不涉及电采暖台区。");
+            }
         }else{
             descStr.append("监测未发现公变过载。");
         }
+
         //重载
         StringBuffer descStr2 = new StringBuffer();
         String maxGb2 = StringUtil.ObjectToString(param.get("maxPbName2"));
         String avg2 = "";
         if(ja4 != null && !ja4.isEmpty()){
+            String tempTq = "",tqs = "";
+            Map<String,String> tempDcn = new HashMap<String,String>();
+
             descStr2.append("监测发现公变重载")
                     .append(ja4.size())
                     .append("个，");
@@ -204,9 +225,10 @@ public class AuxiliaryTools {
             for (int i = 0; i < size; i++) {
                 JSONObject jo = ja4.getJSONObject(i);
                 String key = jo.getString("KEYSS");
+                tempTq = jo.getString("DFD13_GBMC");
                 if(key.equals(maxGb2)){
                     avg2 = jo.getString("avg");
-                    maxGb2 = jo.getString("DFD13_GBMC");
+                    maxGb2 = tempTq;
                 }
                 String unit = jo.getString("DFD13_UNIT");
                 if(temp.containsKey(unit)){
@@ -214,6 +236,12 @@ public class AuxiliaryTools {
                 }else{
                     temp.put(unit,1);
                 }
+                for (int j = 0; j < dcnsj.size(); j++) {
+                    tempDcn = dcnsj.get(j);
+                    if(tempTq != null && tempTq.equals(tempDcn.get("dcn_sjtq"))){
+                        tqs += tempDcn.get("dcn_sjtq") + ",";
+                    }
+                }
             }
             if(!temp.isEmpty()){
                 descStr2.append("分别为");
@@ -227,17 +255,21 @@ public class AuxiliaryTools {
             descStr2.append("其中").append(maxGb2).append(",");
             descStr2.append("重载时长最长" + StringUtil.ObjToFloat(param.get("maxPb2")) + "小时，平均负载率为" + avg2 + "%。")
                     .append("原因为:")
-                    .append(param.get("reason1"))
+                    .append(StringUtil.ObjectToString(param.get("reason1")))
                     .append("。")
                     .append("措施为:")
-                    .append(param.get("cs1"))
+                    .append(StringUtil.ObjectToString(param.get("cs1")))
                     .append("。");
-            descStr2.append("不涉及电采暖线路。");
+            if (!"".equals(tqs)){
+                descStr2.append("其中涉及电采暖台区分别为:").append(tqs.substring(0,tqs.lastIndexOf(","))).append("。");
+            }else{
+                descStr2.append("不涉及电采暖台区。");
+            }
         }else{
-            descStr2.append("监测未发现公变过载。");
+            descStr2.append("监测未发现公变重载。");
         }
-        list.add(descStr.toString());
         list.add(descStr2.toString());
+        list.add(descStr.toString());
         return list;
     }
 
@@ -347,9 +379,11 @@ public class AuxiliaryTools {
      * @param ja 重载
      * @param ja2 过载
      * @param param 附加参数
+     * @param dcnsj
      * @return
      */
-    public static  List<String> getXlgzzDesc(JSONArray ja, JSONArray ja2, Map<String, Object> param) {
+    public static  List<String> getXlgzzDesc(JSONArray ja, JSONArray ja2, Map<String, Object> param,
+                                             List<Map<String, String>> dcnsj) {
         String maxXlName = StringUtil.ObjectToString(param.get("maxXlName"));
         List<String> list = new ArrayList<String>();
         StringBuffer rst = new StringBuffer();
@@ -360,20 +394,28 @@ public class AuxiliaryTools {
                     .append(ja.size() )
                     .append("条。");
             Map<String,Object> map = new HashMap<String,Object>();
-            String xlmc = "";
+            Map<String,String> tempDcn = new HashMap<String,String>();
+            String xlmc = "",xlmctemp = "",dcnxls = "";
             for (int i = 0; i < ja.size(); i++) {
                 JSONObject jo = ja.getJSONObject(i);
                 String key = StringUtil.ObjectToString(jo.get("DFD17_XGSMC"));//县公司名称
                 String keys = StringUtil.ObjectToString(jo.get("KEYSS"));
+                xlmctemp = jo.getString("DFD17_XLMC");
                 if(maxXlName.equals(keys)){
                     maxXlName = jo.getString("avg");
-                    xlmc = jo.getString("DFD17_XLMC");
+                    xlmc = xlmctemp;
                 }
                 if(map.containsKey(key)){
                     map.put(key,Integer.valueOf(String.valueOf(map.get(key))) + 1);
                 }else{
                     map.put(key,1);
                 }
+                for (int j = 0; j < dcnsj.size(); j++) {
+                    tempDcn = dcnsj.get(j);
+                    if(xlmctemp != null && xlmctemp.equals(tempDcn.get("dcn_ssxl"))){
+                        dcnxls += tempDcn.get("dcn_ssxl") + ",";
+                    }
+                }
             }
             if(!map.isEmpty()){
                 rst.append("分别为");
@@ -385,9 +427,12 @@ public class AuxiliaryTools {
             }
             rst.append("其中").append(xlmc).append(",");
             rst.append("重载时长最长" + StringUtil.ObjToFloat(param.get("maxZzsc")) + "小时，平均负载率为" + maxXlName + "%。");
-            rst.append("不涉及电采暖线路。");
+            if(!"".equals(dcnxls)){
+                rst.append("其中涉及电采暖线路分别为：").append(dcnxls.substring(0,dcnxls.lastIndexOf(","))).append("。");
+            }else{
+                rst.append("不涉及电采暖线路。");
+            }
         }
-
         //******************************过载***************************************//
         StringBuffer rst2 = new StringBuffer();
         maxXlName = StringUtil.ObjectToString(param.get("maxXlName2"));
@@ -398,7 +443,8 @@ public class AuxiliaryTools {
             rst2.append(ja2.size() )
                     .append("条。");
             Map<String,Object> map = new HashMap<String,Object>();
-            String xlmc = "";
+            Map<String,String> tempDcn = new HashMap<String,String>();
+            String xlmc = "",xlmctemp = "",dcnxls = "";
             for (int i = 0; i < ja2.size(); i++) {
                 JSONObject jo = ja2.getJSONObject(i);
                 String key = StringUtil.ObjectToString(jo.get("DFD17_XGSMC"));//县公司名称
@@ -413,6 +459,12 @@ public class AuxiliaryTools {
                 }else{
                     map.put(key,1);
                 }
+                for (int j = 0; j < dcnsj.size(); j++) {
+                    tempDcn = dcnsj.get(j);
+                    if(xlmctemp != null && xlmctemp.equals(tempDcn.get("dcn_ssxl"))){
+                        dcnxls += tempDcn.get("dcn_ssxl") + ",";
+                    }
+                }
             }
             if(!map.isEmpty()){
                 rst2.append("分别为");
@@ -424,7 +476,11 @@ public class AuxiliaryTools {
             }
             rst2.append("其中").append(xlmc).append(",");
             rst2.append("过载时长最长" + StringUtil.ObjToFloat(param.get("maxZzsc")) + "小时，平均负载率为" + maxXlName + "%。");
-            rst2.append("不涉及电采暖线路。");
+            if(!"".equals(dcnxls)){
+                rst2.append("其中涉及电采暖线路分别为：").append(dcnxls.substring(0,dcnxls.lastIndexOf(","))).append("。");
+            }else{
+                rst2.append("不涉及电采暖线路。");
+            }
         }
         list.add(rst.toString());
         list.add(rst2.toString());

src/main/java/com/minpay/db/table/mapper/PubBaseDcntzMapper.java

@@ -0,0 +1,67 @@
+package com.minpay.db.table.mapper;
+
+import com.minpay.db.table.model.PubBaseDcntz;
+import com.minpay.db.table.model.PubBaseDcntzExample;
+import java.util.List;
+
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import org.apache.ibatis.annotations.Param;
+
+public interface PubBaseDcntzMapper extends IMINMybatisEntityMapper<PubBaseDcntz, String, PubBaseDcntzExample> {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     * @return
+     */
+    int countByExample(PubBaseDcntzExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(PubBaseDcntzExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     */
+    int insert(PubBaseDcntz record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     */
+    int insertSelective(PubBaseDcntz record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     */
+    List<PubBaseDcntz> selectByExample(PubBaseDcntzExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") PubBaseDcntz record, @Param("example") PubBaseDcntzExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pub_base_dcntz
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") PubBaseDcntz record, @Param("example") PubBaseDcntzExample example);
+}

src/main/java/com/minpay/db/table/model/PubBaseDcntz.java

@@ -0,0 +1,632 @@
+package com.minpay.db.table.model;
+
+import com.startup.minpay.frame.data.AbstractMINBean;
+
+public class PubBaseDcntz extends AbstractMINBean {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_SEQU
+     *
+     * @mbg.generated
+     */
+    private Integer sequ;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_TYPE
+     *
+     * @mbg.generated
+     */
+    private String type;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_UNITID
+     *
+     * @mbg.generated
+     */
+    private String unitid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_UNIT
+     *
+     * @mbg.generated
+     */
+    private String unit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_GDSID
+     *
+     * @mbg.generated
+     */
+    private String gdsid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_GDS
+     *
+     * @mbg.generated
+     */
+    private String gds;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_USER
+     *
+     * @mbg.generated
+     */
+    private String user;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_USERNU
+     *
+     * @mbg.generated
+     */
+    private String usernu;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_SSXL
+     *
+     * @mbg.generated
+     */
+    private String ssxl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_SBLX
+     *
+     * @mbg.generated
+     */
+    private String sblx;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_SJTQ
+     *
+     * @mbg.generated
+     */
+    private String sjtq;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_CNSBRL
+     *
+     * @mbg.generated
+     */
+    private Float cnsbrl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_CNHS
+     *
+     * @mbg.generated
+     */
+    private Integer cnhs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_TQMCYX
+     *
+     * @mbg.generated
+     */
+    private String tqmcyx;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_SCSBMC
+     *
+     * @mbg.generated
+     */
+    private String scsbmc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_TQMCGF
+     *
+     * @mbg.generated
+     */
+    private String tqmcgf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_TQMCYC
+     *
+     * @mbg.generated
+     */
+    private String tqmcyc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pub_base_dcntz.DCN_STATE
+     *
+     * @mbg.generated
+     */
+    private String state;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_ID
+     *
+     * @return the value of pub_base_dcntz.DCN_ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_ID
+     *
+     * @param id the value for pub_base_dcntz.DCN_ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_SEQU
+     *
+     * @return the value of pub_base_dcntz.DCN_SEQU
+     *
+     * @mbg.generated
+     */
+    public Integer getSequ() {
+        return sequ;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_SEQU
+     *
+     * @param sequ the value for pub_base_dcntz.DCN_SEQU
+     *
+     * @mbg.generated
+     */
+    public void setSequ(Integer sequ) {
+        this.sequ = sequ;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_TYPE
+     *
+     * @return the value of pub_base_dcntz.DCN_TYPE
+     *
+     * @mbg.generated
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_TYPE
+     *
+     * @param type the value for pub_base_dcntz.DCN_TYPE
+     *
+     * @mbg.generated
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_UNITID
+     *
+     * @return the value of pub_base_dcntz.DCN_UNITID
+     *
+     * @mbg.generated
+     */
+    public String getUnitid() {
+        return unitid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_UNITID
+     *
+     * @param unitid the value for pub_base_dcntz.DCN_UNITID
+     *
+     * @mbg.generated
+     */
+    public void setUnitid(String unitid) {
+        this.unitid = unitid == null ? null : unitid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_UNIT
+     *
+     * @return the value of pub_base_dcntz.DCN_UNIT
+     *
+     * @mbg.generated
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_UNIT
+     *
+     * @param unit the value for pub_base_dcntz.DCN_UNIT
+     *
+     * @mbg.generated
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_GDSID
+     *
+     * @return the value of pub_base_dcntz.DCN_GDSID
+     *
+     * @mbg.generated
+     */
+    public String getGdsid() {
+        return gdsid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_GDSID
+     *
+     * @param gdsid the value for pub_base_dcntz.DCN_GDSID
+     *
+     * @mbg.generated
+     */
+    public void setGdsid(String gdsid) {
+        this.gdsid = gdsid == null ? null : gdsid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_GDS
+     *
+     * @return the value of pub_base_dcntz.DCN_GDS
+     *
+     * @mbg.generated
+     */
+    public String getGds() {
+        return gds;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_GDS
+     *
+     * @param gds the value for pub_base_dcntz.DCN_GDS
+     *
+     * @mbg.generated
+     */
+    public void setGds(String gds) {
+        this.gds = gds == null ? null : gds.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_USER
+     *
+     * @return the value of pub_base_dcntz.DCN_USER
+     *
+     * @mbg.generated
+     */
+    public String getUser() {
+        return user;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_USER
+     *
+     * @param user the value for pub_base_dcntz.DCN_USER
+     *
+     * @mbg.generated
+     */
+    public void setUser(String user) {
+        this.user = user == null ? null : user.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_USERNU
+     *
+     * @return the value of pub_base_dcntz.DCN_USERNU
+     *
+     * @mbg.generated
+     */
+    public String getUsernu() {
+        return usernu;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_USERNU
+     *
+     * @param usernu the value for pub_base_dcntz.DCN_USERNU
+     *
+     * @mbg.generated
+     */
+    public void setUsernu(String usernu) {
+        this.usernu = usernu == null ? null : usernu.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_SSXL
+     *
+     * @return the value of pub_base_dcntz.DCN_SSXL
+     *
+     * @mbg.generated
+     */
+    public String getSsxl() {
+        return ssxl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_SSXL
+     *
+     * @param ssxl the value for pub_base_dcntz.DCN_SSXL
+     *
+     * @mbg.generated
+     */
+    public void setSsxl(String ssxl) {
+        this.ssxl = ssxl == null ? null : ssxl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_SBLX
+     *
+     * @return the value of pub_base_dcntz.DCN_SBLX
+     *
+     * @mbg.generated
+     */
+    public String getSblx() {
+        return sblx;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_SBLX
+     *
+     * @param sblx the value for pub_base_dcntz.DCN_SBLX
+     *
+     * @mbg.generated
+     */
+    public void setSblx(String sblx) {
+        this.sblx = sblx == null ? null : sblx.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_SJTQ
+     *
+     * @return the value of pub_base_dcntz.DCN_SJTQ
+     *
+     * @mbg.generated
+     */
+    public String getSjtq() {
+        return sjtq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_SJTQ
+     *
+     * @param sjtq the value for pub_base_dcntz.DCN_SJTQ
+     *
+     * @mbg.generated
+     */
+    public void setSjtq(String sjtq) {
+        this.sjtq = sjtq == null ? null : sjtq.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_CNSBRL
+     *
+     * @return the value of pub_base_dcntz.DCN_CNSBRL
+     *
+     * @mbg.generated
+     */
+    public Float getCnsbrl() {
+        return cnsbrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_CNSBRL
+     *
+     * @param cnsbrl the value for pub_base_dcntz.DCN_CNSBRL
+     *
+     * @mbg.generated
+     */
+    public void setCnsbrl(Float cnsbrl) {
+        this.cnsbrl = cnsbrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_CNHS
+     *
+     * @return the value of pub_base_dcntz.DCN_CNHS
+     *
+     * @mbg.generated
+     */
+    public Integer getCnhs() {
+        return cnhs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_CNHS
+     *
+     * @param cnhs the value for pub_base_dcntz.DCN_CNHS
+     *
+     * @mbg.generated
+     */
+    public void setCnhs(Integer cnhs) {
+        this.cnhs = cnhs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_TQMCYX
+     *
+     * @return the value of pub_base_dcntz.DCN_TQMCYX
+     *
+     * @mbg.generated
+     */
+    public String getTqmcyx() {
+        return tqmcyx;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_TQMCYX
+     *
+     * @param tqmcyx the value for pub_base_dcntz.DCN_TQMCYX
+     *
+     * @mbg.generated
+     */
+    public void setTqmcyx(String tqmcyx) {
+        this.tqmcyx = tqmcyx == null ? null : tqmcyx.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_SCSBMC
+     *
+     * @return the value of pub_base_dcntz.DCN_SCSBMC
+     *
+     * @mbg.generated
+     */
+    public String getScsbmc() {
+        return scsbmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_SCSBMC
+     *
+     * @param scsbmc the value for pub_base_dcntz.DCN_SCSBMC
+     *
+     * @mbg.generated
+     */
+    public void setScsbmc(String scsbmc) {
+        this.scsbmc = scsbmc == null ? null : scsbmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_TQMCGF
+     *
+     * @return the value of pub_base_dcntz.DCN_TQMCGF
+     *
+     * @mbg.generated
+     */
+    public String getTqmcgf() {
+        return tqmcgf;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_TQMCGF
+     *
+     * @param tqmcgf the value for pub_base_dcntz.DCN_TQMCGF
+     *
+     * @mbg.generated
+     */
+    public void setTqmcgf(String tqmcgf) {
+        this.tqmcgf = tqmcgf == null ? null : tqmcgf.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_TQMCYC
+     *
+     * @return the value of pub_base_dcntz.DCN_TQMCYC
+     *
+     * @mbg.generated
+     */
+    public String getTqmcyc() {
+        return tqmcyc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_TQMCYC
+     *
+     * @param tqmcyc the value for pub_base_dcntz.DCN_TQMCYC
+     *
+     * @mbg.generated
+     */
+    public void setTqmcyc(String tqmcyc) {
+        this.tqmcyc = tqmcyc == null ? null : tqmcyc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pub_base_dcntz.DCN_STATE
+     *
+     * @return the value of pub_base_dcntz.DCN_STATE
+     *
+     * @mbg.generated
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pub_base_dcntz.DCN_STATE
+     *
+     * @param state the value for pub_base_dcntz.DCN_STATE
+     *
+     * @mbg.generated
+     */
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+}

src/main/java/com/minpay/db/table/own/mapper/DcntzManageMapper.java

@@ -0,0 +1,11 @@
+package com.minpay.db.table.own.mapper;
+import com.startup.minpay.frame.jdbc.IMINMybatisMapper;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DcntzManageMapper extends IMINMybatisMapper {
+
+    List<Map<String, String>> selectTzInf(Map<String, String> param, MINRowBounds rows);
+}

src/main/java/com/minpay/db/table/own/mapper/IReportBatchMapper.java

@@ -85,4 +85,11 @@ public interface IReportBatchMapper  extends IMINMybatisMapper {
      * @return
      */
     List<Map<String, String>> selectPbgzzData2(Map<String, Object> map);
+
+    /**
+     * 电采暖台账
+     * @param map
+     * @return
+     */
+    List<Map<String, String>> selectDcnmx(Map<String, Object> map);
 }

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

@@ -0,0 +1,57 @@
+package com.minpay.reportManage.action;
+
+import com.minpay.db.table.own.mapper.DcntzManageMapper;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import com.startup.minpay.frame.service.base.IMINDataBaseService;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.session.MINSession;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@MINComponent
+public class DcntzReportAction implements IMINAction {
+
+    private IMINDataBaseService db;
+    /** 电采暖台账查询 */
+    public final static String REPORT_INF_QUERY = "reportInfQuery";
+
+
+	/**
+	 *
+	 * @param session
+	 * @return
+	 * @throws MINBusinessException
+	 * @throws SecurityException
+	 * @throws IllegalArgumentException
+	 */
+    @MINAction(value = REPORT_INF_QUERY)
+    public MINActionResult reportInfQuery(
+		@MINParam(key = "page", defaultValue = "1") int page,
+		@MINParam(key = "limit", defaultValue = "10") int limit,
+        MINSession session
+    ) throws MINBusinessException, SecurityException, IllegalArgumentException {
+        MINActionResult res = new MINActionResult();
+        db = Service.lookup(IMINDataBaseService.class);
+		//分页
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		rows.setSeparateSql(true);
+		Map<String,String> param = new HashMap<>();
+		// 查询报表具体信息
+		List<Map<String, String>> list = db.getMybatisMapper(DcntzManageMapper.class)
+				.selectTzInf(param, rows);
+		// 设置返回值
+		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+		return res;
+    }
+
+}

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

@@ -0,0 +1,57 @@
+package com.minpay.reportManage.action;
+
+import com.minpay.db.table.own.mapper.DcntzManageMapper;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import com.startup.minpay.frame.service.base.IMINDataBaseService;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.session.MINSession;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@MINComponent
+public class HsReportAction implements IMINAction {
+
+    private IMINDataBaseService db;
+    /** 电采暖台账查询 */
+    public final static String REPORT_INF_QUERY = "reportInfQuery";
+
+
+	/**
+	 *
+	 * @param session
+	 * @return
+	 * @throws MINBusinessException
+	 * @throws SecurityException
+	 * @throws IllegalArgumentException
+	 */
+    @MINAction(value = REPORT_INF_QUERY)
+    public MINActionResult reportInfQuery(
+		@MINParam(key = "page", defaultValue = "1") int page,
+		@MINParam(key = "limit", defaultValue = "10") int limit,
+        MINSession session
+    ) throws MINBusinessException, SecurityException, IllegalArgumentException {
+        MINActionResult res = new MINActionResult();
+        db = Service.lookup(IMINDataBaseService.class);
+		//分页
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		rows.setSeparateSql(true);
+		Map<String,String> param = new HashMap<>();
+		// 查询报表具体信息
+		List<Map<String, String>> list = db.getMybatisMapper(DcntzManageMapper.class)
+				.selectTzInf(param, rows);
+		// 设置返回值
+		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+		return res;
+    }
+
+}

src/main/resources/com/minpay/db/table/mapper/PubBaseDcntzMapper.xml

@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.minpay.db.table.mapper.PubBaseDcntzMapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.PubBaseDcntz">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="DCN_ID" jdbcType="VARCHAR" property="id" />
+    <result column="DCN_SEQU" jdbcType="INTEGER" property="sequ" />
+    <result column="DCN_TYPE" jdbcType="VARCHAR" property="type" />
+    <result column="DCN_UNITID" jdbcType="VARCHAR" property="unitid" />
+    <result column="DCN_UNIT" jdbcType="VARCHAR" property="unit" />
+    <result column="DCN_GDSID" jdbcType="VARCHAR" property="gdsid" />
+    <result column="DCN_GDS" jdbcType="VARCHAR" property="gds" />
+    <result column="DCN_USER" jdbcType="VARCHAR" property="user" />
+    <result column="DCN_USERNU" jdbcType="VARCHAR" property="usernu" />
+    <result column="DCN_SSXL" jdbcType="VARCHAR" property="ssxl" />
+    <result column="DCN_SBLX" jdbcType="VARCHAR" property="sblx" />
+    <result column="DCN_SJTQ" jdbcType="VARCHAR" property="sjtq" />
+    <result column="DCN_CNSBRL" jdbcType="REAL" property="cnsbrl" />
+    <result column="DCN_CNHS" jdbcType="INTEGER" property="cnhs" />
+    <result column="DCN_TQMCYX" jdbcType="VARCHAR" property="tqmcyx" />
+    <result column="DCN_SCSBMC" jdbcType="VARCHAR" property="scsbmc" />
+    <result column="DCN_TQMCGF" jdbcType="VARCHAR" property="tqmcgf" />
+    <result column="DCN_TQMCYC" jdbcType="VARCHAR" property="tqmcyc" />
+    <result column="DCN_STATE" jdbcType="VARCHAR" property="state" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    DCN_ID, DCN_SEQU, DCN_TYPE, DCN_UNITID, DCN_UNIT, DCN_GDSID, DCN_GDS, DCN_USER, DCN_USERNU, 
+    DCN_SSXL, DCN_SBLX, DCN_SJTQ, DCN_CNSBRL, DCN_CNHS, DCN_TQMCYX, DCN_SCSBMC, DCN_TQMCGF, 
+    DCN_TQMCYC, DCN_STATE
+  </sql>
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.PubBaseDcntzExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pub_base_dcntz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.PubBaseDcntzExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from pub_base_dcntz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.minpay.db.table.model.PubBaseDcntz">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into pub_base_dcntz (DCN_ID, DCN_SEQU, DCN_TYPE, 
+      DCN_UNITID, DCN_UNIT, DCN_GDSID, 
+      DCN_GDS, DCN_USER, DCN_USERNU, 
+      DCN_SSXL, DCN_SBLX, DCN_SJTQ, DCN_CNSBRL, 
+      DCN_CNHS, DCN_TQMCYX, DCN_SCSBMC, 
+      DCN_TQMCGF, DCN_TQMCYC, DCN_STATE
+      )
+    values (#{id,jdbcType=VARCHAR}, #{sequ,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
+      #{unitid,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{gdsid,jdbcType=VARCHAR}, 
+      #{gds,jdbcType=VARCHAR}, #{user,jdbcType=VARCHAR}, #{usernu,jdbcType=VARCHAR}, 
+      #{ssxl,jdbcType=VARCHAR}, #{sblx,jdbcType=VARCHAR}, #{sjtq,jdbcType=VARCHAR}, #{cnsbrl,jdbcType=REAL}, 
+      #{cnhs,jdbcType=INTEGER}, #{tqmcyx,jdbcType=VARCHAR}, #{scsbmc,jdbcType=VARCHAR}, 
+      #{tqmcgf,jdbcType=VARCHAR}, #{tqmcyc,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.PubBaseDcntz">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into pub_base_dcntz
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        DCN_ID,
+      </if>
+      <if test="sequ != null">
+        DCN_SEQU,
+      </if>
+      <if test="type != null">
+        DCN_TYPE,
+      </if>
+      <if test="unitid != null">
+        DCN_UNITID,
+      </if>
+      <if test="unit != null">
+        DCN_UNIT,
+      </if>
+      <if test="gdsid != null">
+        DCN_GDSID,
+      </if>
+      <if test="gds != null">
+        DCN_GDS,
+      </if>
+      <if test="user != null">
+        DCN_USER,
+      </if>
+      <if test="usernu != null">
+        DCN_USERNU,
+      </if>
+      <if test="ssxl != null">
+        DCN_SSXL,
+      </if>
+      <if test="sblx != null">
+        DCN_SBLX,
+      </if>
+      <if test="sjtq != null">
+        DCN_SJTQ,
+      </if>
+      <if test="cnsbrl != null">
+        DCN_CNSBRL,
+      </if>
+      <if test="cnhs != null">
+        DCN_CNHS,
+      </if>
+      <if test="tqmcyx != null">
+        DCN_TQMCYX,
+      </if>
+      <if test="scsbmc != null">
+        DCN_SCSBMC,
+      </if>
+      <if test="tqmcgf != null">
+        DCN_TQMCGF,
+      </if>
+      <if test="tqmcyc != null">
+        DCN_TQMCYC,
+      </if>
+      <if test="state != null">
+        DCN_STATE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="sequ != null">
+        #{sequ,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="unitid != null">
+        #{unitid,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null">
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="gdsid != null">
+        #{gdsid,jdbcType=VARCHAR},
+      </if>
+      <if test="gds != null">
+        #{gds,jdbcType=VARCHAR},
+      </if>
+      <if test="user != null">
+        #{user,jdbcType=VARCHAR},
+      </if>
+      <if test="usernu != null">
+        #{usernu,jdbcType=VARCHAR},
+      </if>
+      <if test="ssxl != null">
+        #{ssxl,jdbcType=VARCHAR},
+      </if>
+      <if test="sblx != null">
+        #{sblx,jdbcType=VARCHAR},
+      </if>
+      <if test="sjtq != null">
+        #{sjtq,jdbcType=VARCHAR},
+      </if>
+      <if test="cnsbrl != null">
+        #{cnsbrl,jdbcType=REAL},
+      </if>
+      <if test="cnhs != null">
+        #{cnhs,jdbcType=INTEGER},
+      </if>
+      <if test="tqmcyx != null">
+        #{tqmcyx,jdbcType=VARCHAR},
+      </if>
+      <if test="scsbmc != null">
+        #{scsbmc,jdbcType=VARCHAR},
+      </if>
+      <if test="tqmcgf != null">
+        #{tqmcgf,jdbcType=VARCHAR},
+      </if>
+      <if test="tqmcyc != null">
+        #{tqmcyc,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.minpay.db.table.model.PubBaseDcntzExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from pub_base_dcntz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update pub_base_dcntz
+    <set>
+      <if test="record.id != null">
+        DCN_ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sequ != null">
+        DCN_SEQU = #{record.sequ,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null">
+        DCN_TYPE = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unitid != null">
+        DCN_UNITID = #{record.unitid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unit != null">
+        DCN_UNIT = #{record.unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gdsid != null">
+        DCN_GDSID = #{record.gdsid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gds != null">
+        DCN_GDS = #{record.gds,jdbcType=VARCHAR},
+      </if>
+      <if test="record.user != null">
+        DCN_USER = #{record.user,jdbcType=VARCHAR},
+      </if>
+      <if test="record.usernu != null">
+        DCN_USERNU = #{record.usernu,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ssxl != null">
+        DCN_SSXL = #{record.ssxl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sblx != null">
+        DCN_SBLX = #{record.sblx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sjtq != null">
+        DCN_SJTQ = #{record.sjtq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cnsbrl != null">
+        DCN_CNSBRL = #{record.cnsbrl,jdbcType=REAL},
+      </if>
+      <if test="record.cnhs != null">
+        DCN_CNHS = #{record.cnhs,jdbcType=INTEGER},
+      </if>
+      <if test="record.tqmcyx != null">
+        DCN_TQMCYX = #{record.tqmcyx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.scsbmc != null">
+        DCN_SCSBMC = #{record.scsbmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tqmcgf != null">
+        DCN_TQMCGF = #{record.tqmcgf,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tqmcyc != null">
+        DCN_TQMCYC = #{record.tqmcyc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        DCN_STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update pub_base_dcntz
+    set DCN_ID = #{record.id,jdbcType=VARCHAR},
+      DCN_SEQU = #{record.sequ,jdbcType=INTEGER},
+      DCN_TYPE = #{record.type,jdbcType=VARCHAR},
+      DCN_UNITID = #{record.unitid,jdbcType=VARCHAR},
+      DCN_UNIT = #{record.unit,jdbcType=VARCHAR},
+      DCN_GDSID = #{record.gdsid,jdbcType=VARCHAR},
+      DCN_GDS = #{record.gds,jdbcType=VARCHAR},
+      DCN_USER = #{record.user,jdbcType=VARCHAR},
+      DCN_USERNU = #{record.usernu,jdbcType=VARCHAR},
+      DCN_SSXL = #{record.ssxl,jdbcType=VARCHAR},
+      DCN_SBLX = #{record.sblx,jdbcType=VARCHAR},
+      DCN_SJTQ = #{record.sjtq,jdbcType=VARCHAR},
+      DCN_CNSBRL = #{record.cnsbrl,jdbcType=REAL},
+      DCN_CNHS = #{record.cnhs,jdbcType=INTEGER},
+      DCN_TQMCYX = #{record.tqmcyx,jdbcType=VARCHAR},
+      DCN_SCSBMC = #{record.scsbmc,jdbcType=VARCHAR},
+      DCN_TQMCGF = #{record.tqmcgf,jdbcType=VARCHAR},
+      DCN_TQMCYC = #{record.tqmcyc,jdbcType=VARCHAR},
+      DCN_STATE = #{record.state,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

src/main/resources/com/minpay/db/table/own/mapper/DcntzManageMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.minpay.db.table.own.mapper.DcntzManageMapper">
+	<select id="selectTzInf" resultType="hashmap" parameterType="java.util.Map">
+		select
+		DCN_ID		ID		,
+		DCN_SEQU    SEQU    ,
+		DCN_TYPE    TYPE    ,
+		DCN_UNITID  UNITI   ,
+		DCN_UNIT    UNIT    ,
+		DCN_GDSID   GDSID   ,
+		DCN_GDS     GDS     ,
+		DCN_USER    USER    ,
+		DCN_USERNU  USERN   ,
+		DCN_SSXL    SSXL    ,
+		DCN_SBLX    SBLX    ,
+		DCN_SJTQ    SJTQ    ,
+		DCN_CNSBRL  CNSBR   ,
+		DCN_CNHS    CNHS    ,
+		DCN_TQMCYX  TQMCY   ,
+		DCN_SCSBMC  SCSBM   ,
+		DCN_TQMCGF  TQMCG   ,
+		DCN_TQMCYC  TQMCY   ,
+		DCN_STATE   STATE
+		from pub_base_dcntz
+		where 1=1
+			<if test="fileName != null  and fileName != ''">
+		    	and DFI_FILE_NAME like concat('%', #{fileName,jdbcType=VARCHAR} ,'%')
+		   	</if>
+		   	order by DCN_SEQU * 1 asc
+	</select>
+</mapper>

src/main/resources/com/minpay/db/table/own/mapper/ReportBatchMapper.xml

@@ -426,6 +426,11 @@
             AND B.DBRT_ID = #{reportTypeId}
             AND DRI_ID = #{reportId}
     </select>
+
+    <!--电采暖台账明细-->
+    <select id="selectDcnmx" resultType="map" parameterType="map">
+        select  DISTINCT dcn_type,dcn_ssxl,dcn_sjtq from pub_base_dcntz
+    </select>
     <select id="selectQxlgdbbData" resultType="map" parameterType="map">
        SELECT
             DFD11_ID,

src/main/webapp/admin/95598/rb/report95598Rb.html

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>95598日报管理</title>
+	<script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+<div class="order-body">
+	<div class="order-tiaojian back-gray">
+		<div class="tiaojian-part1" id = "conditions">
+			<div class="fl f12-gray4-op">所选条件：</div>
+		</div>
+		<div class="tiaojian-part2 fr  demoTable">
+			<button class="order-bnt1 layui-btn" onclick="reloadSearch()" >查询</button>
+			<button class="layui-btn order-bnt2" onclick="reset()">重置</button>
+			<button class="order-bnt2 layui-btn" onclick="uploadExcel()">报表生成</button>
+			<a href="#" id="toggle" class="top">收起</a>
+		</div>
+	</div>
+	<form class="layui-form" action="" id = "formRole">
+		<div class="order-select back-border" id="content">
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">生成日期:</label>
+				<div class="layui-input-inline" style="position: relative;">
+					<input type="text" class="layui-input" id="date" placeholder="请选择日期" readOnly/>
+				</div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">文件名称:</label>
+				<input name="fileName"  id ="fileName" autocomplete="off" 	placeholder="请输入文件名称" class="search-select" onchange = "changeSelectCon(1,this,'inp')">
+			</div>
+		</div>
+	</form>
+</div>
+<div class="shadow-content" style="margin:1.5rem;">
+	<table id="tableTest" lay-filter="tableFilter"></table>
+</div>
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="detail">详情查看</a>
+	<!--		{{#  if(timeType == '00'){ }}-->
+	<!--			<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
+	<!--		{{#  } }}-->
+	<a class="layui-btn layui-btn-xs" lay-event="downLoad">下载</a>
+	<a class="layui-btn layui-btn-xs" lay-event="delete">删除</a>
+</script>
+<script type="text/html" id="algorithmBar">
+	<a class="layui-btn layui-btn-xs" lay-event="algorithmDetail">查看</a>
+</script>
+<script>
+	$("#toggle").click(function() {
+		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
+		$("#content").slideToggle();
+	});
+	var pageId = "290000";//线路重过载
+	// 报表类型
+	var reportType = getQueryString("reportType")//XLGZZRB or XLGZZZB
+	if("XLGZZZB" == reportType){
+		pageId = "290001"
+	}
+	var timeType = getQueryString("timeType");// 00日报01周报02月报
+	var table;
+	var form;
+	layui.use(['table','laydate','form'], function(){
+		var laydate = layui.laydate;
+		laydate.render({
+			elem: '#date'
+			,type: 'date'
+			,range: true
+			,done: function(value, date, endDate){
+				changeSelectCon(0,"date",'date',value)
+			}
+		});
+
+		table = layui.table;
+
+		// 加载数据
+		table.render({
+			id: 'tableTest'
+			,elem: '#tableTest'
+			,limit:10
+			,url: 'ReportManageAction/reportInfQuery' //数据接口
+			,method: 'post'
+			,where:{MINView:"JSON", timeType : timeType, reportType : reportType}
+			,page: true //开启分页
+			,cols: [[ //表头
+				{field:'num', title: '序号',width:'5%', type:'numbers', align: 'center'}
+				,{field: 'uploadDate', title: '生成时间', width:'15%', sort: true}
+				,{field: 'fileName', title: '报表名称', width:'30%'}
+				,{field: 'algorith', title: '算法', width: '10%', toolbar: '#algorithmBar'}
+				,{field: 'operate', title: '操作', width: '40%', toolbar: '#barDemo', fixed : 'right'}
+			]]
+			,done: function(res, curr, count){
+			}
+			,even: true //开启隔行背景
+		});
+
+		// 监听工具条（操作）
+		table.on('tool(tableFilter)', function(obj){
+			//注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			if (layEvent === 'detail'){ //查看算法
+				showDetail(data);
+			} else if(layEvent === 'downLoad'){
+				window.open("../../XlgzzReportAction/reportDownLoad?reportId=" + data.id+"&timeType="+timeType+"&reportType="+reportType);
+			} else if(layEvent === 'delete'){
+				layer.confirm('确认删除？', function(index){
+					layer.close(index);
+					$.request({
+						action : 'ReportManageAction/reportInfDelete',
+						data : {
+							reportId : data.id
+						},
+						success : function(data1) {
+							$.SuccAlert("操作成功!");
+							reloadSearch();
+						},
+						error : function(data2) {
+							$.ErrorAlert(data2.MINErrorMessage);
+						}
+					});
+				});
+			} else if (layEvent === 'edit'){ // 编辑
+				editReport(data);
+			} else if (layEvent === 'algorithmDetail'){ // 算法查看
+				algorithmDetail(data);
+			}
+		});
+	});
+
+	function reloadSearch (t) {
+		var fileName = $("#fileName").val();
+		var date = $("#date").val();
+		//执行重载
+		table.reload('tableTest', {
+			page: {
+				curr: 1 //重新从第 1 页开始
+			}
+			,where: {
+				date : date,
+				fileName : fileName
+			}
+		});
+		if (t == 1) {
+			$.Alert("修改成功");
+		}
+	}
+
+	function reset(){
+		$('#formRole')[0].reset();
+		$("#conditions").html('<div class="fl f12-gray4-op">所选条件：</div>');
+	}
+
+	function uploadExcel(){
+		var openPageId = pageId + "-01";
+		openMainTabPage(openPageId, "报表生成", "95598/reportProduce95598Zb.html?pageId="+openPageId+"&timeType="+timeType+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+
+	function showDetail(data){
+		var openPageId = pageId + "-02";
+		openMainTabPage(openPageId, "详情查看",
+				"xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, null);
+	}
+	function editReport(data){
+		var openPageId = pageId + "-03";
+		openMainTabPage(openPageId, "编辑", "xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+	function algorithmDetail(data){
+		var openPageId = pageId + "-04";
+		openMainTabPage(openPageId, "算法查看", "reprotManage/reportAlgorithm.html?pageId="+openPageId+"&reportTypeId="+data.typeId, '', pageId, null);
+	}
+
+	function changeSelectCon(index, t, type, dateValue){
+		if (type == "date") {
+			if (isEmpty(dateValue)) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		} else if (type == 'inp') {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		} else {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$(t).attr("id","subjects");
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		}
+	}
+
+	var array = new Array('生成日期','文件名称');
+	function getSelectConHtml(index, t, type,dateValue){
+		var name;
+		if (type == "date") {
+			name = $("#"+t).attr("id");
+		} else {
+			name = $(t).attr("id");
+		}
+		var value;
+		if(type == "inp"){
+			value = t.value.substr(0,5)+"..";
+		}
+		if (type == "date") {
+			value = dateValue;
+		}
+		if(type == "sel"){
+			value = $("#stateDiv").find("option:selected").text();
+		}
+		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+				'<div class="fl">' + array[index] + '</div>' +
+				':<span>'+value+'</span>' +
+				'<svg class="icon" aria-hidden="true">' +
+				'<use xlink:href="#iconicon_close1"></use>' +
+				'</svg>' +
+				'</div>';
+		return html;
+	}
+	function removeSearch(t) {
+		if ($(t).attr("name") == 'subjects') {
+			initSelect('stateDiv', "COMPANY_STATE", "state", '', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
+</script>
+</body>
+
+</html>

src/main/webapp/admin/95598/rhb/report95598Rhb.html

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>95598日汇报管理</title>
+	<script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+<div class="order-body">
+	<div class="order-tiaojian back-gray">
+		<div class="tiaojian-part1" id = "conditions">
+			<div class="fl f12-gray4-op">所选条件：</div>
+		</div>
+		<div class="tiaojian-part2 fr  demoTable">
+			<button class="order-bnt1 layui-btn" onclick="reloadSearch()" >查询</button>
+			<button class="layui-btn order-bnt2" onclick="reset()">重置</button>
+			<button class="order-bnt2 layui-btn" onclick="uploadExcel()">报表生成</button>
+			<a href="#" id="toggle" class="top">收起</a>
+		</div>
+	</div>
+	<form class="layui-form" action="" id = "formRole">
+		<div class="order-select back-border" id="content">
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">生成日期:</label>
+				<div class="layui-input-inline" style="position: relative;">
+					<input type="text" class="layui-input" id="date" placeholder="请选择日期" readOnly/>
+				</div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">文件名称:</label>
+				<input name="fileName"  id ="fileName" autocomplete="off" 	placeholder="请输入文件名称" class="search-select" onchange = "changeSelectCon(1,this,'inp')">
+			</div>
+		</div>
+	</form>
+</div>
+<div class="shadow-content" style="margin:1.5rem;">
+	<table id="tableTest" lay-filter="tableFilter"></table>
+</div>
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="detail">详情查看</a>
+	<!--		{{#  if(timeType == '00'){ }}-->
+	<!--			<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
+	<!--		{{#  } }}-->
+	<a class="layui-btn layui-btn-xs" lay-event="downLoad">下载</a>
+	<a class="layui-btn layui-btn-xs" lay-event="delete">删除</a>
+</script>
+<script type="text/html" id="algorithmBar">
+	<a class="layui-btn layui-btn-xs" lay-event="algorithmDetail">查看</a>
+</script>
+<script>
+	$("#toggle").click(function() {
+		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
+		$("#content").slideToggle();
+	});
+	var pageId = "290000";//线路重过载
+	// 报表类型
+	var reportType = getQueryString("reportType")//XLGZZRB or XLGZZZB
+	if("XLGZZZB" == reportType){
+		pageId = "290001"
+	}
+	var timeType = getQueryString("timeType");// 00日报01周报02月报
+	var table;
+	var form;
+	layui.use(['table','laydate','form'], function(){
+		var laydate = layui.laydate;
+		laydate.render({
+			elem: '#date'
+			,type: 'date'
+			,range: true
+			,done: function(value, date, endDate){
+				changeSelectCon(0,"date",'date',value)
+			}
+		});
+
+		table = layui.table;
+
+		// 加载数据
+		table.render({
+			id: 'tableTest'
+			,elem: '#tableTest'
+			,limit:10
+			,url: 'ReportManageAction/reportInfQuery' //数据接口
+			,method: 'post'
+			,where:{MINView:"JSON", timeType : timeType, reportType : reportType}
+			,page: true //开启分页
+			,cols: [[ //表头
+				{field:'num', title: '序号',width:'5%', type:'numbers', align: 'center'}
+				,{field: 'uploadDate', title: '生成时间', width:'15%', sort: true}
+				,{field: 'fileName', title: '报表名称', width:'30%'}
+				,{field: 'algorith', title: '算法', width: '10%', toolbar: '#algorithmBar'}
+				,{field: 'operate', title: '操作', width: '40%', toolbar: '#barDemo', fixed : 'right'}
+			]]
+			,done: function(res, curr, count){
+			}
+			,even: true //开启隔行背景
+		});
+
+		// 监听工具条（操作）
+		table.on('tool(tableFilter)', function(obj){
+			//注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			if (layEvent === 'detail'){ //查看算法
+				showDetail(data);
+			} else if(layEvent === 'downLoad'){
+				window.open("../../XlgzzReportAction/reportDownLoad?reportId=" + data.id+"&timeType="+timeType+"&reportType="+reportType);
+			} else if(layEvent === 'delete'){
+				layer.confirm('确认删除？', function(index){
+					layer.close(index);
+					$.request({
+						action : 'ReportManageAction/reportInfDelete',
+						data : {
+							reportId : data.id
+						},
+						success : function(data1) {
+							$.SuccAlert("操作成功!");
+							reloadSearch();
+						},
+						error : function(data2) {
+							$.ErrorAlert(data2.MINErrorMessage);
+						}
+					});
+				});
+			} else if (layEvent === 'edit'){ // 编辑
+				editReport(data);
+			} else if (layEvent === 'algorithmDetail'){ // 算法查看
+				algorithmDetail(data);
+			}
+		});
+	});
+
+	function reloadSearch (t) {
+		var fileName = $("#fileName").val();
+		var date = $("#date").val();
+		//执行重载
+		table.reload('tableTest', {
+			page: {
+				curr: 1 //重新从第 1 页开始
+			}
+			,where: {
+				date : date,
+				fileName : fileName
+			}
+		});
+		if (t == 1) {
+			$.Alert("修改成功");
+		}
+	}
+
+	function reset(){
+		$('#formRole')[0].reset();
+		$("#conditions").html('<div class="fl f12-gray4-op">所选条件：</div>');
+	}
+
+	function uploadExcel(){
+		var openPageId = pageId + "-01";
+		openMainTabPage(openPageId, "报表生成", "95598/reportProduce95598Zb.html?pageId="+openPageId+"&timeType="+timeType+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+
+	function showDetail(data){
+		var openPageId = pageId + "-02";
+		openMainTabPage(openPageId, "详情查看",
+				"xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, null);
+	}
+	function editReport(data){
+		var openPageId = pageId + "-03";
+		openMainTabPage(openPageId, "编辑", "xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+	function algorithmDetail(data){
+		var openPageId = pageId + "-04";
+		openMainTabPage(openPageId, "算法查看", "reprotManage/reportAlgorithm.html?pageId="+openPageId+"&reportTypeId="+data.typeId, '', pageId, null);
+	}
+
+	function changeSelectCon(index, t, type, dateValue){
+		if (type == "date") {
+			if (isEmpty(dateValue)) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		} else if (type == 'inp') {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		} else {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$(t).attr("id","subjects");
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		}
+	}
+
+	var array = new Array('生成日期','文件名称');
+	function getSelectConHtml(index, t, type,dateValue){
+		var name;
+		if (type == "date") {
+			name = $("#"+t).attr("id");
+		} else {
+			name = $(t).attr("id");
+		}
+		var value;
+		if(type == "inp"){
+			value = t.value.substr(0,5)+"..";
+		}
+		if (type == "date") {
+			value = dateValue;
+		}
+		if(type == "sel"){
+			value = $("#stateDiv").find("option:selected").text();
+		}
+		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+				'<div class="fl">' + array[index] + '</div>' +
+				':<span>'+value+'</span>' +
+				'<svg class="icon" aria-hidden="true">' +
+				'<use xlink:href="#iconicon_close1"></use>' +
+				'</svg>' +
+				'</div>';
+		return html;
+	}
+	function removeSearch(t) {
+		if ($(t).attr("name") == 'subjects') {
+			initSelect('stateDiv', "COMPANY_STATE", "state", '', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
+</script>
+</body>
+
+</html>

src/main/webapp/admin/95598/zb/report95598Zb.html

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>95598周报管理</title>
+	<script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+<div class="order-body">
+	<div class="order-tiaojian back-gray">
+		<div class="tiaojian-part1" id = "conditions">
+			<div class="fl f12-gray4-op">所选条件：</div>
+		</div>
+		<div class="tiaojian-part2 fr  demoTable">
+			<button class="order-bnt1 layui-btn" onclick="reloadSearch()" >查询</button>
+			<button class="layui-btn order-bnt2" onclick="reset()">重置</button>
+			<button class="order-bnt2 layui-btn" onclick="uploadExcel()">报表生成</button>
+			<a href="#" id="toggle" class="top">收起</a>
+		</div>
+	</div>
+	<form class="layui-form" action="" id = "formRole">
+		<div class="order-select back-border" id="content">
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">生成日期:</label>
+				<div class="layui-input-inline" style="position: relative;">
+					<input type="text" class="layui-input" id="date" placeholder="请选择日期" readOnly/>
+				</div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">文件名称:</label>
+				<input name="fileName"  id ="fileName" autocomplete="off" 	placeholder="请输入文件名称" class="search-select" onchange = "changeSelectCon(1,this,'inp')">
+			</div>
+		</div>
+	</form>
+</div>
+<div class="shadow-content" style="margin:1.5rem;">
+	<table id="tableTest" lay-filter="tableFilter"></table>
+</div>
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="detail">详情查看</a>
+	<!--		{{#  if(timeType == '00'){ }}-->
+	<!--			<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
+	<!--		{{#  } }}-->
+	<a class="layui-btn layui-btn-xs" lay-event="downLoad">下载</a>
+	<a class="layui-btn layui-btn-xs" lay-event="delete">删除</a>
+</script>
+<script type="text/html" id="algorithmBar">
+	<a class="layui-btn layui-btn-xs" lay-event="algorithmDetail">查看</a>
+</script>
+<script>
+	$("#toggle").click(function() {
+		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
+		$("#content").slideToggle();
+	});
+	var pageId = "290000";//线路重过载
+	// 报表类型
+	var reportType = getQueryString("reportType")//XLGZZRB or XLGZZZB
+	if("XLGZZZB" == reportType){
+		pageId = "290001"
+	}
+	var timeType = getQueryString("timeType");// 00日报01周报02月报
+	var table;
+	var form;
+	layui.use(['table','laydate','form'], function(){
+		var laydate = layui.laydate;
+		laydate.render({
+			elem: '#date'
+			,type: 'date'
+			,range: true
+			,done: function(value, date, endDate){
+				changeSelectCon(0,"date",'date',value)
+			}
+		});
+
+		table = layui.table;
+
+		// 加载数据
+		table.render({
+			id: 'tableTest'
+			,elem: '#tableTest'
+			,limit:10
+			,url: 'ReportManageAction/reportInfQuery' //数据接口
+			,method: 'post'
+			,where:{MINView:"JSON", timeType : timeType, reportType : reportType}
+			,page: true //开启分页
+			,cols: [[ //表头
+				{field:'num', title: '序号',width:'5%', type:'numbers', align: 'center'}
+				,{field: 'uploadDate', title: '生成时间', width:'15%', sort: true}
+				,{field: 'fileName', title: '报表名称', width:'30%'}
+				,{field: 'algorith', title: '算法', width: '10%', toolbar: '#algorithmBar'}
+				,{field: 'operate', title: '操作', width: '40%', toolbar: '#barDemo', fixed : 'right'}
+			]]
+			,done: function(res, curr, count){
+			}
+			,even: true //开启隔行背景
+		});
+
+		// 监听工具条（操作）
+		table.on('tool(tableFilter)', function(obj){
+			//注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			if (layEvent === 'detail'){ //查看算法
+				showDetail(data);
+			} else if(layEvent === 'downLoad'){
+				window.open("../../XlgzzReportAction/reportDownLoad?reportId=" + data.id+"&timeType="+timeType+"&reportType="+reportType);
+			} else if(layEvent === 'delete'){
+				layer.confirm('确认删除？', function(index){
+					layer.close(index);
+					$.request({
+						action : 'ReportManageAction/reportInfDelete',
+						data : {
+							reportId : data.id
+						},
+						success : function(data1) {
+							$.SuccAlert("操作成功!");
+							reloadSearch();
+						},
+						error : function(data2) {
+							$.ErrorAlert(data2.MINErrorMessage);
+						}
+					});
+				});
+			} else if (layEvent === 'edit'){ // 编辑
+				editReport(data);
+			} else if (layEvent === 'algorithmDetail'){ // 算法查看
+				algorithmDetail(data);
+			}
+		});
+	});
+
+	function reloadSearch (t) {
+		var fileName = $("#fileName").val();
+		var date = $("#date").val();
+		//执行重载
+		table.reload('tableTest', {
+			page: {
+				curr: 1 //重新从第 1 页开始
+			}
+			,where: {
+				date : date,
+				fileName : fileName
+			}
+		});
+		if (t == 1) {
+			$.Alert("修改成功");
+		}
+	}
+
+	function reset(){
+		$('#formRole')[0].reset();
+		$("#conditions").html('<div class="fl f12-gray4-op">所选条件：</div>');
+	}
+
+	function uploadExcel(){
+		var openPageId = pageId + "-01";
+		openMainTabPage(openPageId, "报表生成", "95598/reportProduce95598Zb.html?pageId="+openPageId+"&timeType="+timeType+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+
+	function showDetail(data){
+		var openPageId = pageId + "-02";
+		openMainTabPage(openPageId, "详情查看",
+				"xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, null);
+	}
+	function editReport(data){
+		var openPageId = pageId + "-03";
+		openMainTabPage(openPageId, "编辑", "xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+	function algorithmDetail(data){
+		var openPageId = pageId + "-04";
+		openMainTabPage(openPageId, "算法查看", "reprotManage/reportAlgorithm.html?pageId="+openPageId+"&reportTypeId="+data.typeId, '', pageId, null);
+	}
+
+	function changeSelectCon(index, t, type, dateValue){
+		if (type == "date") {
+			if (isEmpty(dateValue)) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		} else if (type == 'inp') {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		} else {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$(t).attr("id","subjects");
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		}
+	}
+
+	var array = new Array('生成日期','文件名称');
+	function getSelectConHtml(index, t, type,dateValue){
+		var name;
+		if (type == "date") {
+			name = $("#"+t).attr("id");
+		} else {
+			name = $(t).attr("id");
+		}
+		var value;
+		if(type == "inp"){
+			value = t.value.substr(0,5)+"..";
+		}
+		if (type == "date") {
+			value = dateValue;
+		}
+		if(type == "sel"){
+			value = $("#stateDiv").find("option:selected").text();
+		}
+		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+				'<div class="fl">' + array[index] + '</div>' +
+				':<span>'+value+'</span>' +
+				'<svg class="icon" aria-hidden="true">' +
+				'<use xlink:href="#iconicon_close1"></use>' +
+				'</svg>' +
+				'</div>';
+		return html;
+	}
+	function removeSearch(t) {
+		if ($(t).attr("name") == 'subjects') {
+			initSelect('stateDiv', "COMPANY_STATE", "state", '', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
+</script>
+</body>
+
+</html>

src/main/webapp/admin/95598/zhb/report95598Zhb.html

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>95598周汇报管理</title>
+	<script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+<div class="order-body">
+	<div class="order-tiaojian back-gray">
+		<div class="tiaojian-part1" id = "conditions">
+			<div class="fl f12-gray4-op">所选条件：</div>
+		</div>
+		<div class="tiaojian-part2 fr  demoTable">
+			<button class="order-bnt1 layui-btn" onclick="reloadSearch()" >查询</button>
+			<button class="layui-btn order-bnt2" onclick="reset()">重置</button>
+			<button class="order-bnt2 layui-btn" onclick="uploadExcel()">报表生成</button>
+			<a href="#" id="toggle" class="top">收起</a>
+		</div>
+	</div>
+	<form class="layui-form" action="" id = "formRole">
+		<div class="order-select back-border" id="content">
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">生成日期:</label>
+				<div class="layui-input-inline" style="position: relative;">
+					<input type="text" class="layui-input" id="date" placeholder="请选择日期" readOnly/>
+				</div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">文件名称:</label>
+				<input name="fileName"  id ="fileName" autocomplete="off" 	placeholder="请输入文件名称" class="search-select" onchange = "changeSelectCon(1,this,'inp')">
+			</div>
+		</div>
+	</form>
+</div>
+<div class="shadow-content" style="margin:1.5rem;">
+	<table id="tableTest" lay-filter="tableFilter"></table>
+</div>
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="detail">详情查看</a>
+	<!--		{{#  if(timeType == '00'){ }}-->
+	<!--			<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
+	<!--		{{#  } }}-->
+	<a class="layui-btn layui-btn-xs" lay-event="downLoad">下载</a>
+	<a class="layui-btn layui-btn-xs" lay-event="delete">删除</a>
+</script>
+<script type="text/html" id="algorithmBar">
+	<a class="layui-btn layui-btn-xs" lay-event="algorithmDetail">查看</a>
+</script>
+<script>
+	$("#toggle").click(function() {
+		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
+		$("#content").slideToggle();
+	});
+	var pageId = "290000";//线路重过载
+	// 报表类型
+	var reportType = getQueryString("reportType")//XLGZZRB or XLGZZZB
+	if("XLGZZZB" == reportType){
+		pageId = "290001"
+	}
+	var timeType = getQueryString("timeType");// 00日报01周报02月报
+	var table;
+	var form;
+	layui.use(['table','laydate','form'], function(){
+		var laydate = layui.laydate;
+		laydate.render({
+			elem: '#date'
+			,type: 'date'
+			,range: true
+			,done: function(value, date, endDate){
+				changeSelectCon(0,"date",'date',value)
+			}
+		});
+
+		table = layui.table;
+
+		// 加载数据
+		table.render({
+			id: 'tableTest'
+			,elem: '#tableTest'
+			,limit:10
+			,url: 'ReportManageAction/reportInfQuery' //数据接口
+			,method: 'post'
+			,where:{MINView:"JSON", timeType : timeType, reportType : reportType}
+			,page: true //开启分页
+			,cols: [[ //表头
+				{field:'num', title: '序号',width:'5%', type:'numbers', align: 'center'}
+				,{field: 'uploadDate', title: '生成时间', width:'15%', sort: true}
+				,{field: 'fileName', title: '报表名称', width:'30%'}
+				,{field: 'algorith', title: '算法', width: '10%', toolbar: '#algorithmBar'}
+				,{field: 'operate', title: '操作', width: '40%', toolbar: '#barDemo', fixed : 'right'}
+			]]
+			,done: function(res, curr, count){
+			}
+			,even: true //开启隔行背景
+		});
+
+		// 监听工具条（操作）
+		table.on('tool(tableFilter)', function(obj){
+			//注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			if (layEvent === 'detail'){ //查看算法
+				showDetail(data);
+			} else if(layEvent === 'downLoad'){
+				window.open("../../XlgzzReportAction/reportDownLoad?reportId=" + data.id+"&timeType="+timeType+"&reportType="+reportType);
+			} else if(layEvent === 'delete'){
+				layer.confirm('确认删除？', function(index){
+					layer.close(index);
+					$.request({
+						action : 'ReportManageAction/reportInfDelete',
+						data : {
+							reportId : data.id
+						},
+						success : function(data1) {
+							$.SuccAlert("操作成功!");
+							reloadSearch();
+						},
+						error : function(data2) {
+							$.ErrorAlert(data2.MINErrorMessage);
+						}
+					});
+				});
+			} else if (layEvent === 'edit'){ // 编辑
+				editReport(data);
+			} else if (layEvent === 'algorithmDetail'){ // 算法查看
+				algorithmDetail(data);
+			}
+		});
+	});
+
+	function reloadSearch (t) {
+		var fileName = $("#fileName").val();
+		var date = $("#date").val();
+		//执行重载
+		table.reload('tableTest', {
+			page: {
+				curr: 1 //重新从第 1 页开始
+			}
+			,where: {
+				date : date,
+				fileName : fileName
+			}
+		});
+		if (t == 1) {
+			$.Alert("修改成功");
+		}
+	}
+
+	function reset(){
+		$('#formRole')[0].reset();
+		$("#conditions").html('<div class="fl f12-gray4-op">所选条件：</div>');
+	}
+
+	function uploadExcel(){
+		var openPageId = pageId + "-01";
+		openMainTabPage(openPageId, "报表生成", "95598/reportProduce95598Zb.html?pageId="+openPageId+"&timeType="+timeType+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+
+	function showDetail(data){
+		var openPageId = pageId + "-02";
+		openMainTabPage(openPageId, "详情查看",
+				"xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, null);
+	}
+	function editReport(data){
+		var openPageId = pageId + "-03";
+		openMainTabPage(openPageId, "编辑", "xlgzz/reportManageDetailXlgzz.html?pageId="+openPageId+"&reportId="
+				+data.id+"&type="+data.type+"&typeId="+data.typeId
+				+"&fileName="+chineseUrlEncode(data.fileName)+"&reportType="+reportType, '', pageId, reloadSearch);
+	}
+	function algorithmDetail(data){
+		var openPageId = pageId + "-04";
+		openMainTabPage(openPageId, "算法查看", "reprotManage/reportAlgorithm.html?pageId="+openPageId+"&reportTypeId="+data.typeId, '', pageId, null);
+	}
+
+	function changeSelectCon(index, t, type, dateValue){
+		if (type == "date") {
+			if (isEmpty(dateValue)) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		} else if (type == 'inp') {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		} else {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$(t).attr("id","subjects");
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		}
+	}
+
+	var array = new Array('生成日期','文件名称');
+	function getSelectConHtml(index, t, type,dateValue){
+		var name;
+		if (type == "date") {
+			name = $("#"+t).attr("id");
+		} else {
+			name = $(t).attr("id");
+		}
+		var value;
+		if(type == "inp"){
+			value = t.value.substr(0,5)+"..";
+		}
+		if (type == "date") {
+			value = dateValue;
+		}
+		if(type == "sel"){
+			value = $("#stateDiv").find("option:selected").text();
+		}
+		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+				'<div class="fl">' + array[index] + '</div>' +
+				':<span>'+value+'</span>' +
+				'<svg class="icon" aria-hidden="true">' +
+				'<use xlink:href="#iconicon_close1"></use>' +
+				'</svg>' +
+				'</div>';
+		return html;
+	}
+	function removeSearch(t) {
+		if ($(t).attr("name") == 'subjects') {
+			initSelect('stateDiv', "COMPANY_STATE", "state", '', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
+</script>
+</body>
+
+</html>

src/main/webapp/admin/basedata/dcntzManage.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>电采暖台账维护</title>
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+    <div class="order-body">
+        <div class="order-tiaojian back-gray">
+            <div class="tiaojian-part1" id = "conditions">
+                <div class="fl f12-gray4-op">所选条件：</div>
+            </div>
+            <div class="tiaojian-part2 fr  demoTable">
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="reloadSearch()" >查询</button>
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="reset()">重置</button>
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="uploadExcel()">导入</button>
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="downLoadExcel()">导出</button>
+            </div>
+        </div>
+        <form class="layui-form" action="" id = "formRole">
+            <div class="order-select back-border" id="content">
+                <div class="d-dashed" style="margin: 10px 0;"></div>
+                <div class="layui-inline">
+                    <label class="f12-gray4">采暖类型:</label>
+                    <div class="layui-input-inline" style="position: relative;">
+                        <input type="text" class="layui-input" id="date" placeholder="请输入" readOnly/>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="f12-gray4">设备或线路名称:</label>
+                    <input name="fileName"  id ="fileName" autocomplete="off" placeholder="请输入" class="search-select" onchange = "changeSelectCon(1,this,'inp')">
+                </div>
+            </div>
+        </form>
+    </div>
+	<div class="shadow-content" style="margin:1.5rem;">
+    	<table id="tableTest" lay-filter="tableFilter"></table>
+	</div>
+<script>
+	var pageId = "210003";
+    var table;
+    var form;
+    layui.use(['table'], function(){
+        var col = [
+            {field:'SEQU',title:'序号'},
+            {field:'TYPE',title:'采暖类型'},
+            {field:'UNIT',title:'供电单位名称'},
+            {field:'GDS',title:'供电所名称'},
+            {field:'USER',title:'用户名称'},
+            {field:'USERN',title:'户号'},
+            {field:'SSXL',title:'所属线路'},
+            {field:'SBLX',title:'设备类型'},
+            {field:'SJTQ',title:'涉及台区'},
+            {field:'CNSBRL',title:'采暖设备容量'},
+            {field:'CNHS',title:'采暖户数'},
+            {field:'TQMCYX',title:'营销提供的台区名称'},
+            {field:'SCSBMC',title:'生产设备名称'},
+            {field:'TQMCGF',title:'供服系统台区名称'},
+            {field:'TQMCYC',title:'用采系统台区名称'}
+        ];
+        for (var i = 0; i < col.length; i++) {
+            col[i]['width'] = "10%";
+            if (i > 1){
+                col[i]['edit'] = "text";
+            }
+        }
+        var cols = [];
+        cols.push(col)
+        table = layui.table;
+        // 加载数据
+        table.render({
+            id: 'tableTest'
+            ,elem: '#tableTest'
+            ,limit:15
+            ,url: 'DcntzReportAction/reportInfQuery' //数据接口
+            ,method: 'post'
+            ,where:{MINView:"JSON"}
+            ,page: true //开启分页
+            ,cols: cols
+            ,done: function(res, curr, count){
+            }
+            ,even: true //开启隔行背景
+        });
+
+        // 监听工具条（操作）
+        table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            var tr = obj.tr; //获得当前行 tr 的DOM对象
+            if (layEvent === 'detail'){ //查看
+
+            } else if(layEvent === 'downLoad'){
+
+            } else if(layEvent === 'delete'){
+
+            }
+        });
+    });
+</script>
+</body>
+
+</html>

src/main/webapp/admin/basedata/hsManage.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>电采暖台账维护</title>
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+    <div class="order-body">
+        <div class="order-tiaojian back-gray">
+            <div class="tiaojian-part1" id = "conditions">
+                <div class="fl f12-gray4-op">所选条件：</div>
+            </div>
+            <div class="tiaojian-part2 fr  demoTable">
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="reloadSearch()" >查询</button>
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="reset()">重置</button>
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="uploadExcel()">导入</button>
+                <button class="order-bnt2 layui-btn layui-btn-disabled" onclick="downLoadExcel()">导出</button>
+            </div>
+        </div>
+        <form class="layui-form" action="" id = "formRole">
+            <div class="order-select back-border" id="content">
+                <div class="d-dashed" style="margin: 10px 0;"></div>
+                <div class="layui-inline">
+                    <label class="f12-gray4">采暖类型:</label>
+                    <div class="layui-input-inline" style="position: relative;">
+                        <input type="text" class="layui-input" id="date" placeholder="请输入" readOnly/>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="f12-gray4">设备或线路名称:</label>
+                    <input name="fileName"  id ="fileName" autocomplete="off" placeholder="请输入" class="search-select" onchange = "changeSelectCon(1,this,'inp')">
+                </div>
+            </div>
+        </form>
+    </div>
+	<div class="shadow-content" style="margin:1.5rem;">
+    	<table id="tableTest" lay-filter="tableFilter"></table>
+	</div>
+<script>
+	var pageId = "210003";
+    var table;
+    var form;
+    layui.use(['table'], function(){
+        var col = [
+            {field:'SEQU',title:'序号'},
+            {field:'TYPE',title:'采暖类型'},
+            {field:'UNIT',title:'供电单位名称'},
+            {field:'GDS',title:'供电所名称'},
+            {field:'USER',title:'用户名称'},
+            {field:'USERN',title:'户号'},
+            {field:'SSXL',title:'所属线路'},
+            {field:'SBLX',title:'设备类型'},
+            {field:'SJTQ',title:'涉及台区'},
+            {field:'CNSBRL',title:'采暖设备容量'},
+            {field:'CNHS',title:'采暖户数'},
+            {field:'TQMCYX',title:'营销提供的台区名称'},
+            {field:'SCSBMC',title:'生产设备名称'},
+            {field:'TQMCGF',title:'供服系统台区名称'},
+            {field:'TQMCYC',title:'用采系统台区名称'}
+        ];
+        for (var i = 0; i < col.length; i++) {
+            col[i]['width'] = "10%";
+            if (i > 1){
+                col[i]['edit'] = "text";
+            }
+        }
+        var cols = [];
+        cols.push(col)
+        table = layui.table;
+        // 加载数据
+        table.render({
+            id: 'tableTest'
+            ,elem: '#tableTest'
+            ,limit:15
+            ,url: 'DcntzReportAction/reportInfQuery' //数据接口
+            ,method: 'post'
+            ,where:{MINView:"JSON"}
+            ,page: true //开启分页
+            ,cols: cols
+            ,done: function(res, curr, count){
+            }
+            ,even: true //开启隔行背景
+        });
+
+        // 监听工具条（操作）
+        table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            var tr = obj.tr; //获得当前行 tr 的DOM对象
+            if (layEvent === 'detail'){ //查看
+
+            } else if(layEvent === 'downLoad'){
+
+            } else if(layEvent === 'delete'){
+
+            }
+        });
+    });
+</script>
+</body>
+
+</html>

src/main/webapp/admin/reprotManage/dataWare.html

@@ -92,10 +92,8 @@
 					$.ErrorAlert(data2.MINErrorMessage);
 				}
 	  	});
-    	  
-    	  
+
 		  table = layui.table;
-		  
 		  // 加载数据
 		  table.render({
 			id: 'tableTest'