能源计划优化

module_base/src/main/java/org/jeecg/modules/energyPlan/controller/EnergyPlanController.java

@@ -53,7 +53,11 @@ public class EnergyPlanController extends JeecgController<EnergyPlan, IEnergyPla
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												   HttpServletRequest req) {
-		QueryWrapper<EnergyPlan> queryWrapper = QueryGenerator.initQueryWrapper(energyPlan, req.getParameterMap());
+		EnergyPlan energyPlan1 = new EnergyPlan();
+		energyPlan1.setEnergytypeid(energyPlan.getEnergytypeid());
+		energyPlan1.setEquipmentid(energyPlan.getEquipmentid());
+		QueryWrapper<EnergyPlan> queryWrapper = QueryGenerator.initQueryWrapper(energyPlan1, req.getParameterMap());
+		queryWrapper.like(energyPlan.getEquipmentcode()!=null && !energyPlan.equals(""),"equipmentcode",energyPlan.getEquipmentcode());
 		Page<EnergyPlan> page = new Page<EnergyPlan>(pageNo, pageSize);
 		IPage<EnergyPlan> pageList = energyPlanService.page(page, queryWrapper);
 		return Result.OK(pageList);

module_base/src/main/java/org/jeecg/modules/energyPlan/entity/EnergyPlan.java

@@ -62,9 +62,9 @@ public class EnergyPlan implements Serializable {
     @ApiModelProperty(value = "设备编号")
     private String equipmentcode;
 	/**计划日期*/
-	@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")
+	@Excel(name = "计划日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "计划日期")
     private Date plandate;
 	/**能源分类ID*/