yumeng 4 năm trước cách đây
mục cha
commit
c8094f8484

+ 21 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -4,12 +4,10 @@ import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.SupplierList;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
-import cn.com.ctop.common.module.service.IMaterialInfoService;
-import cn.com.ctop.common.module.service.IProjectService;
-import cn.com.ctop.common.module.service.ISysRoleService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -156,6 +154,8 @@ public class ProjectController {
 
     @Autowired
     private ISysCategoryService sysCategoryService;
+    @Autowired
+    private ISupplierListService supplierListService;
 
     /**
      * 分页列表查询
@@ -202,6 +202,23 @@ public class ProjectController {
             queryWrapper.like("project_name", projectName);
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
+        List<Project> records = pageList.getRecords();
+        if (!Check.isNull(records)) {
+            for (Project project1 : records) {
+                if (!Check.isNull(project1.getSupplierCode())) {
+                    QueryWrapper<SupplierList> supplierListQueryWrapper = new QueryWrapper<>();
+                    supplierListQueryWrapper.eq("supplier_code", project1.getSupplierCode());
+                    supplierListQueryWrapper.last("limit 1");
+                    SupplierList one = supplierListService.getOne(supplierListQueryWrapper);
+                    if (!Check.isNull(one)) {
+                        project1.setSupplierName(one.getSupplierName());
+                    }
+                }
+
+
+            }
+
+        }
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

+ 5 - 3
module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -56,7 +56,7 @@ public class Project {
 
     @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
     private String industryId;
-    @Dict(dicCode = "code",dictTable="sys_category",dicText="name")
+    @Dict(dicCode = "code", dictTable = "sys_category", dicText = "name")
     private String industryCode;
     /**
      * 创建人
@@ -101,9 +101,12 @@ public class Project {
     private Long maxBid;
 
     //供应商
-    @Dict(dicCode = "supplier_code", dictTable = "ctop_supplier_list", dicText = "supplier_name")
+    //  @Dict(dicCode = "supplier_code", dictTable = "ctop_supplier_list", dicText = "supplier_name")
     private String supplierCode;
 
+    @TableField(exist = false)
+    private String supplierName;
+
     // 销售
     @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String saleId;
@@ -133,5 +136,4 @@ public class Project {
     private Integer needExamine;
 
 
-
 }