能源费率优化

module_base/src/main/java/org/jeecg/modules/energyRate/controller/EnergyRateController.java

@@ -53,7 +53,7 @@ public class EnergyRateController {
 	private IEnergyRateService energyRateService;
 	@Autowired
 	private IEnergyRateDetailService energyRateDetailService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -70,12 +70,20 @@ public class EnergyRateController {
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												   HttpServletRequest req) {
-		QueryWrapper<EnergyRate> queryWrapper = QueryGenerator.initQueryWrapper(energyRate, req.getParameterMap());
+		EnergyRate energyRate1 = new EnergyRate();
+		energyRate1.setRatetype(energyRate.getRatetype());
+		energyRate1.setEnergytypeid(energyRate.getEnergytypeid());
+		energyRate1.setBegintime(energyRate.getBegintime());
+		energyRate1.setEndtime(energyRate.getEndtime());
+		QueryWrapper<EnergyRate> queryWrapper = QueryGenerator.initQueryWrapper(energyRate1, req.getParameterMap());
+		queryWrapper.like(energyRate.getName()!=null && !energyRate.getName().equals(""),"name",energyRate.getName());
+		queryWrapper.like(energyRate.getRateunit()!=null && !energyRate.getRateunit().equals(""),"name",energyRate.getRateunit());
+		queryWrapper.like(energyRate.getRemark()!=null && !energyRate.getRemark().equals(""),"name",energyRate.getRemark());
 		Page<EnergyRate> page = new Page<EnergyRate>(pageNo, pageSize);
 		IPage<EnergyRate> pageList = energyRateService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -89,10 +97,10 @@ public class EnergyRateController {
 	public Result<String> add(@RequestBody EnergyRatePage energyRatePage) {
 		EnergyRate energyRate = new EnergyRate();
 		BeanUtils.copyProperties(energyRatePage, energyRate);
-		energyRateService.saveMain(energyRate, energyRatePage.getEnergyRateDetailList());
+		energyRateService.saveMain(energyRate, energyRatePage.getBaseEnergyRateDetailList());
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -110,10 +118,10 @@ public class EnergyRateController {
 		if(energyRateEntity ==null) {
 			return Result.error("未找到对应数据");
 		}
-		energyRateService.updateMain(energyRate, energyRatePage.getEnergyRateDetailList());
+		energyRateService.updateMain(energyRate, energyRatePage.getBaseEnergyRateDetailList());
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -128,7 +136,7 @@ public class EnergyRateController {
 		energyRateService.delMain(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -143,7 +151,7 @@ public class EnergyRateController {
 		this.energyRateService.delBatchMain(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功！");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -161,7 +169,7 @@ public class EnergyRateController {
 		return Result.OK(energyRate);
 
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -207,7 +215,7 @@ public class EnergyRateController {
           EnergyRatePage vo = new EnergyRatePage();
           BeanUtils.copyProperties(main, vo);
           List<EnergyRateDetail> energyRateDetailList = energyRateDetailService.selectByMainId(main.getId());
-          vo.setEnergyRateDetailList(energyRateDetailList);
+          vo.setBaseEnergyRateDetailList(energyRateDetailList);
           pageList.add(vo);
       }
 
@@ -244,7 +252,7 @@ public class EnergyRateController {
               for (EnergyRatePage page : list) {
                   EnergyRate po = new EnergyRate();
                   BeanUtils.copyProperties(page, po);
-                  energyRateService.saveMain(po, page.getEnergyRateDetailList());
+                  energyRateService.saveMain(po, page.getBaseEnergyRateDetailList());
               }
               return Result.OK("文件导入成功！数据行数:" + list.size());
           } catch (Exception e) {

module_base/src/main/java/org/jeecg/modules/energyRate/entity/EnergyRate.java

@@ -35,16 +35,16 @@ public class EnergyRate implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
@@ -70,15 +70,15 @@ public class EnergyRate implements Serializable {
     @ApiModelProperty(value = "单位")
     private java.lang.String rateunit;
 	/**费率有效期开始*/
-	@Excel(name = "费率有效期开始", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "费率有效期开始", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "费率有效期开始")
     private java.util.Date begintime;
 	/**费率有效期结束*/
-	@Excel(name = "费率有效期结束", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "费率有效期结束", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "费率有效期结束")
     private java.util.Date endtime;
 }

module_base/src/main/java/org/jeecg/modules/energyRate/vo/EnergyRatePage.java

@@ -29,16 +29,16 @@ public class EnergyRatePage {
 	@ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
 	@ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
@@ -62,20 +62,20 @@ public class EnergyRatePage {
 	@ApiModelProperty(value = "单位")
     private java.lang.String rateunit;
 	/**费率有效期开始*/
-	@Excel(name = "费率有效期开始", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "费率有效期开始", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "费率有效期开始")
     private java.util.Date begintime;
 	/**费率有效期结束*/
-	@Excel(name = "费率有效期结束", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "费率有效期结束", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "费率有效期结束")
     private java.util.Date endtime;
-	
+
 	@ExcelCollection(name="base_energy_rate_detail")
 	@ApiModelProperty(value = "base_energy_rate_detail")
-	private List<EnergyRateDetail> energyRateDetailList;
-	
+	private List<EnergyRateDetail> baseEnergyRateDetailList;
+
 }