wangb 2 лет назад
Родитель
Сommit
df44cdd43d

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

@@ -30,7 +30,7 @@ public class ProEconEquipmentmodelController {
     /**
      * 查询
      * @param id
-     * @param code
+     * @param nem_code
      * @param name
      * @param pageNum
      * @param pageSize
@@ -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 = "code", required = false) String code,
+                      @RequestParam(value = "nem_code", required = false) String nem_code,
                       @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, code, name, pageNum, pageSize);
+        IPage<ProEconEquipmentmodel> list = proEconEquipmentmodelService.list(id, nem_code, name, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

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

@@ -33,7 +33,7 @@ public class ProEconEquipmentmodel extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nem_code;
 
     /**
      * 名称
@@ -41,6 +41,11 @@ public class ProEconEquipmentmodel extends Model {
     private String name;
 
     /**
+     * 名称
+     */
+    private String aname;
+
+    /**
      * 描述
      */
     private String description;

+ 1 - 1
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 code, String name,String pageNum, String pageSize);
+    IPage<ProEconEquipmentmodel> list (String id, String nem_code, String name,String pageNum, String pageSize);
 }

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

@@ -22,13 +22,13 @@ import org.springframework.stereotype.Service;
 public class ProEconEquipmentmodelServiceImpl extends ServiceImpl<ProEconEquipmentmodelMapper, ProEconEquipmentmodel> implements IProEconEquipmentmodelService {
 
     @Override
-    public IPage<ProEconEquipmentmodel> list(String id, String code, String name, String pageNum, String pageSize) {
+    public IPage<ProEconEquipmentmodel> list(String id, String nem_code, String name, String pageNum, String pageSize) {
         QueryWrapper<ProEconEquipmentmodel> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
             qw.eq("id", id);
         }
-        if (StringUtils.isNotEmpty(code)) {
-            qw.like(code, "code");
+        if (StringUtils.isNotEmpty(nem_code)) {
+            qw.like(nem_code, "code");
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.like(name, "name");