能源分类、能耗分析优化

module_base/src/main/java/org/jeecg/modules/energyItem/controller/EnergyItemController.java

@@ -66,7 +66,12 @@ public class EnergyItemController extends JeecgController<EnergyItem, IEnergyIte
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<EnergyItem> queryWrapper = QueryGenerator.initQueryWrapper(energyItem, req.getParameterMap());
+		EnergyItem energyItem1 = new EnergyItem();
+		energyItem1.setEnergytypeid(energyItem.getEnergytypeid());
+		QueryWrapper<EnergyItem> queryWrapper = QueryGenerator.initQueryWrapper(energyItem1, req.getParameterMap());
+		queryWrapper.like(energyItem.getEnergyitemname()!=null && !energyItem.getEnergyitemname().equals(""), "energyitemname",energyItem.getEnergyitemname());
+		queryWrapper.like(energyItem.getRemark()!=null && !energyItem.getRemark().equals(""), "energyitemname",energyItem.getRemark());
+		queryWrapper.orderByDesc("create_time");
 		Page<EnergyItem> page = new Page<EnergyItem>(pageNo, pageSize);
 		IPage<EnergyItem> pageList = energyItemService.page(page, queryWrapper);
 		return Result.OK(pageList);

module_base/src/main/java/org/jeecg/modules/energyItem/entity/EnergyItem.java

@@ -40,16 +40,16 @@ public class EnergyItem implements Serializable {
     @ApiModelProperty(value = "创建者")
     private 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 Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private 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 Date updateTime;
 	/**备注*/
@@ -63,5 +63,6 @@ public class EnergyItem implements Serializable {
 	/**能源分类ID*/
 	@Excel(name = "能源分类ID", width = 15)
     @ApiModelProperty(value = "能源分类ID")
+    @Dict(dictTable ="base_energy_type",dicText = "name",dicCode = "id")
     private String energytypeid;
 }

module_base/src/main/java/org/jeecg/modules/energyType/controller/EnergyTypeController.java

@@ -68,7 +68,12 @@ public class EnergyTypeController extends JeecgController<EnergyType, IEnergyTyp
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<EnergyType> queryWrapper = QueryGenerator.initQueryWrapper(energyType, req.getParameterMap());
+		EnergyType energyType1 = new EnergyType();
+		energyType1.setUnit(energyType.getUnit());
+		QueryWrapper<EnergyType> queryWrapper = QueryGenerator.initQueryWrapper(energyType1, req.getParameterMap());
+		queryWrapper.like(energyType.getName()!=null && !energyType.getName().equals(""),"name",energyType.getName());
+		queryWrapper.like(energyType.getRemark()!=null && !energyType.getRemark().equals(""),"name",energyType.getRemark());
+		queryWrapper.orderByDesc("create_time");
 		Page<EnergyType> page = new Page<EnergyType>(pageNo, pageSize);
 		IPage<EnergyType> pageList = energyTypeService.page(page, queryWrapper);
 		return Result.OK(pageList);

module_base/src/main/java/org/jeecg/modules/energyType/entity/EnergyType.java

@@ -40,16 +40,16 @@ public class EnergyType implements Serializable {
     @ApiModelProperty(value = "创建者")
     private 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 Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private 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 Date updateTime;
 	/**备注*/