diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 42475c08c..d95690078 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -483,6 +483,7 @@ public class WxEnergyController extends BaseController { } } Date end = DateUtils.getTimeAfterMonths(1, start); + end = DateUtils.getSecondsTimeAfter(-1, end); Map retMap = new HashMap(); retMap.put("startTime", start); retMap.put("endTime", end); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java index 0ad68fcbf..5e7c36d39 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java @@ -24,6 +24,9 @@ public class WxEnergyFeesTime extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="id",name="id") private Long id; + @io.swagger.annotations.ApiModelProperty(value = "名称", name = "name") + private String name; + @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java index 6f593bde2..9f8d701bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java @@ -139,6 +139,7 @@ public class WxEnergyMeterReading extends TenantEntity { excelTitle.put("meterType", "表类型"); excelTitle.put("preNumber", "上次抄表数"); excelTitle.put("preTime", "上次抄表时间"); + excelTitle.put("preByName", "上次抄表人"); excelTitle.put("curNumber", "本次抄表数"); return excelTitle; } @@ -155,6 +156,7 @@ public class WxEnergyMeterReading extends TenantEntity { excelObject.put("meterType", this.getMeterTypeName()); excelObject.put("preNumber", this.getPreNumber()); excelObject.put("preTime", DateUtils.formatDateTime(this.getPreTime())); + excelObject.put("preTime", this.getPreByName()); excelObject.put("curNumber", this.getCurNumber()); return excelObject; } diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index 12e0370a3..c32c6f1b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -34,6 +34,10 @@ public class ExcelService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); public void exportExcel(Map titleMap,List> list, String fileName,String sheetName, HttpServletResponse response) { + exportExcel(titleMap,list,fileName,sheetName,20,10,response); + } + + public void exportExcel(Map titleMap,List> list, String fileName,String sheetName, int width, int height,HttpServletResponse response) { //defaultExport(list, fileName, response); List modelList = new ArrayList(); ExcelExportEntity excelentity = null; @@ -41,8 +45,8 @@ public class ExcelService { String titleKey = it.next(); String title = titleMap.get(titleKey); excelentity = new ExcelExportEntity(title, titleKey); - excelentity.setWidth(20); - excelentity.setHeight(10); + excelentity.setWidth(width); + excelentity.setHeight(height); modelList.add(excelentity); } exportExcel(modelList,list,null,sheetName,fileName,true,response); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java index aa1b7bec7..f9edcd5b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java @@ -91,15 +91,16 @@ public class WxEnergyHelper { List floorAreaList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#floorArea_", "#"); List meterList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#meter_", "#"); - formula = formula.replaceAll("\\{.*?\\}", ""); + formula = formula.replaceAll("\\{", "").replaceAll("\\}", ""); if (null != buildingAreaMap && null != buildingAreaList && buildingAreaList.size() > 0 ) { for (int i = 0 ; i < buildingAreaList.size(); i ++) { String buildArea = buildingAreaList.get(i); String[] bs = buildArea.split("_"); if (null != bs && bs.length > 1) { - BigDecimal buildingArea = buildingAreaMap.get(Long.parseLong(bs[1])); + String b1 = bs[1].replace("#}", ""); + BigDecimal buildingArea = buildingAreaMap.get(Long.parseLong(b1)); if (null != buildingArea) { - formula = formula.replaceAll("#buildingArea_"+Long.parseLong(bs[1])+"#", buildingArea.toPlainString()); + formula = formula.replaceAll("#buildingArea_"+Long.parseLong(b1)+"#", buildingArea.toPlainString()); } } } @@ -110,9 +111,10 @@ public class WxEnergyHelper { String floorArea = floorAreaList.get(i); String[] bs = floorArea.split("_"); if (null != bs && bs.length > 1) { - BigDecimal floorarea = floorAreaMap.get(Long.parseLong(bs[1])); + String b1 = bs[1].replace("#}", ""); + BigDecimal floorarea = floorAreaMap.get(Long.parseLong(b1)); if (null != floorarea) { - formula = formula.replaceAll("#floorArea_"+Long.parseLong(bs[1])+"#", floorarea.toPlainString()); + formula = formula.replaceAll("#floorArea_"+Long.parseLong(b1)+"#", floorarea.toPlainString()); } } @@ -124,9 +126,10 @@ public class WxEnergyHelper { String meter = meterList.get(i); String[] bs = meter.split("_"); if (null != bs && bs.length > 1) { - BigDecimal mu = meterNumberMap.get(Long.parseLong(bs[1])); + String b1 = bs[1].replace("#}", ""); + BigDecimal mu = meterNumberMap.get(Long.parseLong(b1)); if (null != mu ) { - formula = formula.replaceAll("#meter_"+Long.parseLong(bs[1])+"#", mu.toPlainString()); + formula = formula.replaceAll("#meter_"+Long.parseLong(b1)+"#", mu.toPlainString()); } } } @@ -145,11 +148,11 @@ public class WxEnergyHelper { return ; } List buildingAreaList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#", "#"); - formula = formula.replaceAll("\\{.*?\\}", ""); + formula = formula.replaceAll("\\{", "").replaceAll("\\}", ""); if (null != buildingAreaList && buildingAreaList.size() > 0 ) { for (int i = 0 ; i < buildingAreaList.size(); i ++) { String floorArea = buildingAreaList.get(i); - String relpaceFloorArea = floorArea.replaceAll("\\{.*?\\}", ""); + String relpaceFloorArea = floorArea.replaceAll("\\{", "").replaceAll("\\}", ""); formula = formula.replaceAll(relpaceFloorArea, "1"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 31d96bf96..a8b3da2ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -322,7 +322,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { } Date date = new Date(); if (record.getId() == null) { - //查询是不是已经有了 WxEnergyFeesTimeShop tsq = new WxEnergyFeesTimeShop(); tsq.updateTenantInfo(record); @@ -939,7 +938,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { execlList.add(r.generateExcelData()); } } - excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "抄表数据.xlsx","sheet1", response); + excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "抄表数据.xlsx","sheet1",10,5, response); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml index fa999cb15..f49a99094 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesTimeMapper.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`type`,`start_time`,`end_time`,`period`,`shop_size` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`name`,`type`,`start_time`,`end_time`,`period`,`shop_size` @@ -30,6 +31,9 @@ and `period` = #{period} + + and `name` like concat('%', #{name},'%') + and `type` = #{type} and id in diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml index 0b3ec847f..c15f754b9 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml @@ -90,7 +90,7 @@