| @@ -483,6 +483,7 @@ public class WxEnergyController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| Date end = DateUtils.getTimeAfterMonths(1, start); | Date end = DateUtils.getTimeAfterMonths(1, start); | ||||
| end = DateUtils.getSecondsTimeAfter(-1, end); | |||||
| Map retMap = new HashMap(); | Map retMap = new HashMap(); | ||||
| retMap.put("startTime", start); | retMap.put("startTime", start); | ||||
| retMap.put("endTime", end); | retMap.put("endTime", end); | ||||
| @@ -24,6 +24,9 @@ public class WxEnergyFeesTime extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="id",name="id") | @io.swagger.annotations.ApiModelProperty(value="id",name="id") | ||||
| private Long id; | private Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "名称", name = "name") | |||||
| private String name; | |||||
| @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| @@ -139,6 +139,7 @@ public class WxEnergyMeterReading extends TenantEntity { | |||||
| excelTitle.put("meterType", "表类型"); | excelTitle.put("meterType", "表类型"); | ||||
| excelTitle.put("preNumber", "上次抄表数"); | excelTitle.put("preNumber", "上次抄表数"); | ||||
| excelTitle.put("preTime", "上次抄表时间"); | excelTitle.put("preTime", "上次抄表时间"); | ||||
| excelTitle.put("preByName", "上次抄表人"); | |||||
| excelTitle.put("curNumber", "本次抄表数"); | excelTitle.put("curNumber", "本次抄表数"); | ||||
| return excelTitle; | return excelTitle; | ||||
| } | } | ||||
| @@ -155,6 +156,7 @@ public class WxEnergyMeterReading extends TenantEntity { | |||||
| excelObject.put("meterType", this.getMeterTypeName()); | excelObject.put("meterType", this.getMeterTypeName()); | ||||
| excelObject.put("preNumber", this.getPreNumber()); | excelObject.put("preNumber", this.getPreNumber()); | ||||
| excelObject.put("preTime", DateUtils.formatDateTime(this.getPreTime())); | excelObject.put("preTime", DateUtils.formatDateTime(this.getPreTime())); | ||||
| excelObject.put("preTime", this.getPreByName()); | |||||
| excelObject.put("curNumber", this.getCurNumber()); | excelObject.put("curNumber", this.getCurNumber()); | ||||
| return excelObject; | return excelObject; | ||||
| } | } | ||||
| @@ -34,6 +34,10 @@ public class ExcelService { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public void exportExcel(Map<String,String> titleMap,List<Map<String, Object>> list, String fileName,String sheetName, HttpServletResponse response) { | public void exportExcel(Map<String,String> titleMap,List<Map<String, Object>> list, String fileName,String sheetName, HttpServletResponse response) { | ||||
| exportExcel(titleMap,list,fileName,sheetName,20,10,response); | |||||
| } | |||||
| public void exportExcel(Map<String,String> titleMap,List<Map<String, Object>> list, String fileName,String sheetName, int width, int height,HttpServletResponse response) { | |||||
| //defaultExport(list, fileName, response); | //defaultExport(list, fileName, response); | ||||
| List<ExcelExportEntity> modelList = new ArrayList<ExcelExportEntity>(); | List<ExcelExportEntity> modelList = new ArrayList<ExcelExportEntity>(); | ||||
| ExcelExportEntity excelentity = null; | ExcelExportEntity excelentity = null; | ||||
| @@ -41,8 +45,8 @@ public class ExcelService { | |||||
| String titleKey = it.next(); | String titleKey = it.next(); | ||||
| String title = titleMap.get(titleKey); | String title = titleMap.get(titleKey); | ||||
| excelentity = new ExcelExportEntity(title, titleKey); | excelentity = new ExcelExportEntity(title, titleKey); | ||||
| excelentity.setWidth(20); | |||||
| excelentity.setHeight(10); | |||||
| excelentity.setWidth(width); | |||||
| excelentity.setHeight(height); | |||||
| modelList.add(excelentity); | modelList.add(excelentity); | ||||
| } | } | ||||
| exportExcel(modelList,list,null,sheetName,fileName,true,response); | exportExcel(modelList,list,null,sheetName,fileName,true,response); | ||||
| @@ -91,15 +91,16 @@ public class WxEnergyHelper { | |||||
| List<String> floorAreaList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#floorArea_", "#"); | List<String> floorAreaList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#floorArea_", "#"); | ||||
| List<String> meterList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#meter_", "#"); | List<String> meterList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#meter_", "#"); | ||||
| formula = formula.replaceAll("\\{.*?\\}", ""); | |||||
| formula = formula.replaceAll("\\{", "").replaceAll("\\}", ""); | |||||
| if (null != buildingAreaMap && null != buildingAreaList && buildingAreaList.size() > 0 ) { | if (null != buildingAreaMap && null != buildingAreaList && buildingAreaList.size() > 0 ) { | ||||
| for (int i = 0 ; i < buildingAreaList.size(); i ++) { | for (int i = 0 ; i < buildingAreaList.size(); i ++) { | ||||
| String buildArea = buildingAreaList.get(i); | String buildArea = buildingAreaList.get(i); | ||||
| String[] bs = buildArea.split("_"); | String[] bs = buildArea.split("_"); | ||||
| if (null != bs && bs.length > 1) { | 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) { | 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 floorArea = floorAreaList.get(i); | ||||
| String[] bs = floorArea.split("_"); | String[] bs = floorArea.split("_"); | ||||
| if (null != bs && bs.length > 1) { | 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) { | 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 meter = meterList.get(i); | ||||
| String[] bs = meter.split("_"); | String[] bs = meter.split("_"); | ||||
| if (null != bs && bs.length > 1) { | 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 ) { | 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 ; | return ; | ||||
| } | } | ||||
| List<String> buildingAreaList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#", "#"); | List<String> buildingAreaList = PlaceholderExtractorWithPrefixAndSuffix.extractPlaceholders(formula, "#", "#"); | ||||
| formula = formula.replaceAll("\\{.*?\\}", ""); | |||||
| formula = formula.replaceAll("\\{", "").replaceAll("\\}", ""); | |||||
| if (null != buildingAreaList && buildingAreaList.size() > 0 ) { | if (null != buildingAreaList && buildingAreaList.size() > 0 ) { | ||||
| for (int i = 0 ; i < buildingAreaList.size(); i ++) { | for (int i = 0 ; i < buildingAreaList.size(); i ++) { | ||||
| String floorArea = buildingAreaList.get(i); | String floorArea = buildingAreaList.get(i); | ||||
| String relpaceFloorArea = floorArea.replaceAll("\\{.*?\\}", ""); | |||||
| String relpaceFloorArea = floorArea.replaceAll("\\{", "").replaceAll("\\}", ""); | |||||
| formula = formula.replaceAll(relpaceFloorArea, "1"); | formula = formula.replaceAll(relpaceFloorArea, "1"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -322,7 +322,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| } | } | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //查询是不是已经有了 | //查询是不是已经有了 | ||||
| WxEnergyFeesTimeShop tsq = new WxEnergyFeesTimeShop(); | WxEnergyFeesTimeShop tsq = new WxEnergyFeesTimeShop(); | ||||
| tsq.updateTenantInfo(record); | tsq.updateTenantInfo(record); | ||||
| @@ -939,7 +938,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| execlList.add(r.generateExcelData()); | execlList.add(r.generateExcelData()); | ||||
| } | } | ||||
| } | } | ||||
| excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "抄表数据.xlsx","sheet1", response); | |||||
| excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "抄表数据.xlsx","sheet1",10,5, response); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -7,6 +7,7 @@ | |||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | ||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | ||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | ||||
| <result column="name" jdbcType="VARCHAR" property="name"/> | |||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/> | <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/> | ||||
| <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/> | <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/> | ||||
| @@ -15,7 +16,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -30,6 +31,9 @@ | |||||
| <if test=" null != period and '' != period"> | <if test=" null != period and '' != period"> | ||||
| and `period` = #{period} | and `period` = #{period} | ||||
| </if> | </if> | ||||
| <if test=" null != name and '' != name"> | |||||
| and `name` like concat('%', #{name},'%') | |||||
| </if> | |||||
| <if test=" null != type ">and `type` = #{type}</if> | <if test=" null != type ">and `type` = #{type}</if> | ||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| @@ -90,7 +90,7 @@ | |||||
| </update> | </update> | ||||
| <select id="findNumberSum" parameterType="com.iformall.domain.po.WxEnergyMeterReading" resultType="decimal"> | <select id="findNumberSum" parameterType="com.iformall.domain.po.WxEnergyMeterReading" resultType="decimal"> | ||||
| select sum(CAST(ifnull(cur_number,'0') AS DECIMAL(20,4)) - CAST(ifnull(pre_number,'0') AS DECIMAL(20,4))) total_number | |||||
| select sum((CAST(ifnull(cur_number,'0') AS DECIMAL(20,4)) - CAST(ifnull(pre_number,'0') AS DECIMAL(20,4)))/CAST(ifnull(meter_rate,'1') AS DECIMAL(20,4))) total_number | |||||
| from wx_energy_meter_reading | from wx_energy_meter_reading | ||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||