浏览代码

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java
syh 4 年之前
父节点
当前提交
649bd83666

+ 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.setSupplierCode_dictText(one.getSupplierName());
+                    }
+                }
+
+
+            }
+
+        }
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

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

@@ -30,7 +30,6 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_project对象", description = "项目")
 public class Project {
-
     /**
      * id
      */
@@ -56,7 +55,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;
     /**
      * 创建人
@@ -100,15 +99,15 @@ public class Project {
      */
     private Long maxBid;
 
-    /**
-     * 供应商
-     */
-    @Dict(dicCode = "supplier_code", dictTable = "ctop_supplier_list", dicText = "supplier_name")
     private String supplierCode;
 
     /**
      * 销售
      */
+    @TableField(exist = false)
+    private String supplierCode_dictText;
+
+    // 销售
     @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String saleId;
     /**
@@ -132,10 +131,7 @@ public class Project {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
-
     @TableField(exist = false)
     private Integer needExamine;
 
-
-
 }