对应通知、折标系数、停产时间修改

app/dbc-app/src/main/java/com/nantian/cloud/dbcapp/mapper/record/EnterpriseEnergyDataMapper.java

@@ -137,4 +137,6 @@ public interface EnterpriseEnergyDataMapper extends BaseMapper<EnterpriseEnergyD
 
     //获取新注册企业
     List<Map<String, String>> getRegisterEnterprise(@Param("list") List<String> accountList);
-}
+
+    Integer getMarks(@Param("dataCode") String dataCode);
+}

app/dbc-app/src/main/java/com/nantian/cloud/dbcapp/service/impl/EnterpriseEnergyDataImpl.java

@@ -162,7 +162,11 @@ public class EnterpriseEnergyDataImpl implements EnterpriseEnergyDataService {
 //        Integer total = enterpriseEnergyDataMapper.energyTotal(type, energyDataVo, start, end);
 //        Pages pages = new Pages(page.getSize(), page.getCurrent());
         IPage<EnterpriseEnergyDataVo> dataVoList = enterpriseEnergyDataMapper.energyPage(page, type, energyDataVo, start, end);
+        Integer marks=0;
         for (EnterpriseEnergyDataVo dataVo : dataVoList.getRecords()) {
+            String datacodes=dataVo.getDataCode().substring(10,14);
+            marks=enterpriseEnergyDataMapper.getMarks(datacodes);
+            dataVo.setMarkingRange(marks);
             dataVo.setColumnName();
         }
 //        Pages dataVoPage = new Pages(total, page.getSize(), page.getCurrent(), dataVoList);

app/dbc-app/src/main/java/com/nantian/cloud/dbcapp/vo/EnterpriseEnergyDataVo.java

@@ -33,6 +33,7 @@ public class EnterpriseEnergyDataVo {
     private String statTypeName;
     private String scopeName;
     private String isAdditional;
+    private Integer markingRange;
 
     public void setColumnName(){
         switch (this.statType){

app/dbc-app/src/main/java/com/nantian/cloud/dbcapp/vo/ProcedureVO.java

@@ -54,6 +54,7 @@ public class ProcedureVO {
 
     private String isEnable;
 
+    private String startTime;
 
     private String energyUseType;