后台管理BUG调整

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconEquipmentmodelController.java

@@ -39,11 +39,11 @@ public class ProEconEquipmentmodelController {
     @GetMapping(value = "/list")
     @ApiOperation(value = "设备型号-列表", notes = "设备型号-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
-                      @RequestParam(value = "nem_code", required = false) String nem_code,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProEconEquipmentmodel> list = proEconEquipmentmodelService.list(id, nem_code, name, pageNum, pageSize);
+        IPage<ProEconEquipmentmodel> list = proEconEquipmentmodelService.list(id, nemCode, name, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconEquipmentmodel.java

@@ -33,7 +33,7 @@ public class ProEconEquipmentmodel extends Model {
     /**
      * 编码
      */
-    private String nem_code;
+    private String nemCode;
 
     /**
      * 名称

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProEconEquipmentmodelService.java

@@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProEconEquipmentmodelService extends IService<ProEconEquipmentmodel> {
-    IPage<ProEconEquipmentmodel> list (String id, String nem_code, String name,String pageNum, String pageSize);
+    IPage<ProEconEquipmentmodel> list (String id, String nemCode, String name,String pageNum, String pageSize);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconEquipmentmodelServiceImpl.java

@@ -22,16 +22,16 @@ import org.springframework.stereotype.Service;
 public class ProEconEquipmentmodelServiceImpl extends ServiceImpl<ProEconEquipmentmodelMapper, ProEconEquipmentmodel> implements IProEconEquipmentmodelService {
 
     @Override
-    public IPage<ProEconEquipmentmodel> list(String id, String nem_code, String name, String pageNum, String pageSize) {
+    public IPage<ProEconEquipmentmodel> list(String id, String nemCode, String name, String pageNum, String pageSize) {
         QueryWrapper<ProEconEquipmentmodel> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.eq("id", id);
+            qw.lambda().eq(ProEconEquipmentmodel::getId, id);
         }
-        if (StringUtils.isNotEmpty(nem_code)) {
-            qw.like(nem_code, "code");
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.lambda().like(ProEconEquipmentmodel::getNemCode,nemCode);
         }
         if (StringUtils.isNotEmpty(name)) {
-            qw.like(name, "name");
+            qw.lambda().like( ProEconEquipmentmodel::getName,name);
         }
         Page<ProEconEquipmentmodel> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<ProEconEquipmentmodel> companysPage = getBaseMapper().selectPage(page, qw);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

@@ -97,7 +97,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
         }
 
         if (StringUtils.isNotEmpty(nemCode)) {
-            qw.lambda().like(ProEconTestingPoint::getName, nemCode);
+            qw.lambda().like(ProEconTestingPoint::getNemCode, nemCode);
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.lambda().like(ProEconTestingPoint::getName, name);