wangb 2 سال پیش
والد
کامیت
6c197ea420

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 150
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/GeneratorCodeConfig.java


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

@@ -36,7 +36,7 @@ public class ProBasicPowerstationController {
      *
      * @param id
      * @param name
-     * @param code
+     * @param nemCode
      * @param companyId
      * @param pageNum
      * @param pageSize
@@ -46,13 +46,13 @@ public class ProBasicPowerstationController {
     @ApiOperation(value = "场站-列表", notes = "场站-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
-                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
                       @RequestParam(value = "companyId", required = false) String companyId,
                       @RequestParam(value = "groupId", required = false) String groupId,
                       @RequestParam(value = "regionId", required = false) String regionId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicPowerstation> list = proBasicWindpowerstationService.getList(id, name, code, groupId,companyId,regionId, pageNum, pageSize);
+        IPage<ProBasicPowerstation> list = proBasicWindpowerstationService.getList(id, name, nemCode, groupId,companyId,regionId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

+ 1 - 1
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicPowerstationService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicPowerstationService extends IService<ProBasicPowerstation> {
-    IPage<ProBasicPowerstation> getList(String id, String name, String code,String groupId, String companyId,String regionId, String pageNum, String pageSize);
+    IPage<ProBasicPowerstation> getList(String id, String name, String nemCode,String groupId, String companyId,String regionId, String pageNum, String pageSize);
     List<ProBasicPowerstation> getList(String regionId,String companyId,String nemCode);
 
 }

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

@@ -31,16 +31,16 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
             qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(code)) {
-            qw.like(code, "code");
+            qw.like("code", code);
         }
         if (StringUtils.isNotEmpty(name)) {
-            qw.like(name, "name");
+            qw.like("name", name);
         }
         if (StringUtils.isNotEmpty(model)) {
-            qw.like(model, "model");
+            qw.like("model",model );
         }
         if (StringUtils.isNotEmpty(uniformCode)) {
-            qw.eq(uniformCode, "uniform_code");
+            qw.eq("uniformCode",uniformCode );
         }
 
         Page<ProBasicPowerstationPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));

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

@@ -32,15 +32,15 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
     @Autowired
     private EdosUtil goldenUtil;
     @Override
-    public IPage<ProBasicPowerstation> getList(String id, String name, String code, String groupId,String companyId, String regionId,String pageNum, String pageSize) {
+    public IPage<ProBasicPowerstation> getList(String id, String name, String nemCode, String groupId,String companyId, String regionId,String pageNum, String pageSize) {
         QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
         }
 
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("nem_code",code);
+        if (StringUtils.isNotEmpty(nemCode)){
+            qw.like("nemCode",nemCode);
         }
 
         if (StringUtils.isNotEmpty(name)){