xml

jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysDept;
@@ -55,6 +56,30 @@ public class SysXzqhController extends BaseController
     @Autowired
     private SysDeptService sysDeptService;
 
+    @GetMapping("/getGuangDong")
+    public AjaxResult getGuangDong() {
+
+        List<SysXzqh> list = sysXzqhService.list(Wrappers.lambdaQuery(SysXzqh.class)
+                .likeRight(SysXzqh::getXzqhdm, "44")
+                .eq(SysXzqh::getLayer, 2));
+
+        SysXzqh xzqh = new SysXzqh();
+        xzqh.setLayer(2);
+        xzqh.setXzqhdm("");
+        xzqh.setName("所有区域");
+        list.add(0,xzqh);
+
+
+
+        SysXzqh sysXzqh = new SysXzqh();
+        sysXzqh.setLayer(2);
+        sysXzqh.setXzqhdm("省外");
+        sysXzqh.setName("省外");
+        list.add(1,sysXzqh);
+        return AjaxResult.success(list);
+
+
+    }
 
 
 

jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java

@@ -131,7 +131,19 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
 
         SysUser user = UserUtils.getUser();
         if (user.getUserName().equals("admin")) {
-            return bsSgcYxjdDynamicCreditService.selectPage(sp);
+            IPage<BsSgcYxjdDynamicCredit> page = bsSgcYxjdDynamicCreditService.selectPage(sp);
+
+            List<BsSgcYxjdDynamicCredit> records = page.getRecords();
+
+            for (BsSgcYxjdDynamicCredit record : records) {
+                String enterpriseId = record.getEnterpriseId();
+                BsSgcYxjdEnterpriseInfo byId = bsSgcYxjdEnterpriseInfoService.getById(enterpriseId);
+                record.setEnterpriseName(byId.getEnterpriseName());
+            }
+
+            page.setRecords(records);
+
+            return page;
         } else {
             LambdaQueryWrapper<SysUserRole> lambdaQuery = Wrappers.lambdaQuery(SysUserRole.class);
 
@@ -159,7 +171,19 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
                 page.setTotal(creditList.size());
                 return page;
             } else {
-                return bsSgcYxjdDynamicCreditService.selectPage(sp);
+                IPage<BsSgcYxjdDynamicCredit> page = bsSgcYxjdDynamicCreditService.selectPage(sp);
+
+                List<BsSgcYxjdDynamicCredit> records = page.getRecords();
+
+                for (BsSgcYxjdDynamicCredit record : records) {
+                    String enterpriseId = record.getEnterpriseId();
+                    BsSgcYxjdEnterpriseInfo one = bsSgcYxjdEnterpriseInfoService.getById(enterpriseId);
+                    record.setEnterpriseName(one.getEnterpriseName());
+                }
+
+                page.setRecords(records);
+
+                return page;
             }
         }
 

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java

@@ -1,6 +1,8 @@
 package com.kms.enterprise.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -52,6 +54,9 @@ public class BsSgcYxjdDynamicCredit extends BaseEntity
     @ApiModelProperty("良好行为")
     private String goodBehavior;
 
+    @TableField(exist = false)
+    private String enterpriseName;
+
     /** 表彰等级 */
     @Excel(name = "表彰等级")
     @ApiModelProperty("表彰等级")

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdPersonnelInfo.java

@@ -83,4 +83,6 @@ public class BsSgcYxjdPersonnelInfo extends BaseEntity
     @ApiModelProperty("人员类别")
     private String owerDept;
 
+    private String speciality;
+
 }