能耗分项、能源分类-下拉列表

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

@@ -50,6 +50,15 @@ public class EnergyItemController extends JeecgController<EnergyItem, IEnergyIte
 	@Autowired
 	private IEnergyItemService energyItemService;
 
+	/**能耗分项-下拉列表*/
+	@ApiOperation(value="能耗分项-下拉列表", notes="能耗分项-下拉列表")
+	@GetMapping(value = "/xialaList")
+	public Result<List<EnergyItem>> xialaList() {
+		List<EnergyItem> list= energyItemService.list();
+		return Result.OK(list);
+	}
+
+
 	/**
 	 * 分页列表查询
 	 *
@@ -70,7 +79,7 @@ public class EnergyItemController extends JeecgController<EnergyItem, IEnergyIte
 		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.like(energyItem.getRemark()!=null && !energyItem.getRemark().equals(""), "remark",energyItem.getRemark());
 		queryWrapper.orderByDesc("create_time");
 		Page<EnergyItem> page = new Page<EnergyItem>(pageNo, pageSize);
 		IPage<EnergyItem> pageList = energyItemService.page(page, queryWrapper);

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.energyItem.entity.EnergyItem;
 import org.jeecg.modules.energyType.entity.EnergyType;
 import org.jeecg.modules.energyType.service.IEnergyTypeService;
 
@@ -52,6 +53,15 @@ public class EnergyTypeController extends JeecgController<EnergyType, IEnergyTyp
 	@Autowired
 	private IEnergyTypeService energyTypeService;
 
+
+	 /**能源分类-下拉列表*/
+	 @ApiOperation(value="能源分类-下拉列表", notes="能源分类-下拉列表")
+	 @GetMapping(value = "/xialaList")
+	 public Result<List<EnergyType>> xialaList() {
+		 List<EnergyType> list= energyTypeService.list();
+		 return Result.OK(list);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *