朱园亮 / xingyun-erp · Commits

Commit e666264ce3dac6ba689b03fbe0b262e6b758f58b

Authored by 房远帅
1 parent f1193851

采购-供应商报价看板：列表新增采购处

Inline Side-by-side
Showing 2 changed files with 23 additions and 0 deletions
@@ -75,6 +75,18 @@ public class SupplierQuotationProjectQuote extends BaseEntity implements BaseDto @@ -75,6 +75,18 @@ public class SupplierQuotationProjectQuote extends BaseEntity implements BaseDto
75 private String bidStatus; 75 private String bidStatus;
76 76
77 /** 77 /**
  78 + * 采购处(非持久化字段)
  79 + */
  80 + @TableField(exist = false)
  81 + private String purchaseDepartment;
  82 +
  83 + /**
  84 + * 采购处名称(非持久化字段)
  85 + */
  86 + @TableField(exist = false)
  87 + private String purchaseDepartmentName;
  88 +
  89 + /**
78 * 创建人ID 90 * 创建人ID
79 */ 91 */
80 @TableField(fill = FieldFill.INSERT) 92 @TableField(fill = FieldFill.INSERT)
@@ -11,8 +11,10 @@ import com.lframework.starter.web.core.utils.IdUtil; @@ -11,8 +11,10 @@ import com.lframework.starter.web.core.utils.IdUtil;
11 import com.lframework.starter.web.core.utils.OpLogUtil; 11 import com.lframework.starter.web.core.utils.OpLogUtil;
12 import com.lframework.starter.web.core.components.security.SecurityUtil; 12 import com.lframework.starter.web.core.components.security.SecurityUtil;
13 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 13 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
  14 +import com.lframework.starter.web.inner.entity.SysDept;
14 import com.lframework.starter.web.inner.entity.SysRole; 15 import com.lframework.starter.web.inner.entity.SysRole;
15 import com.lframework.starter.web.inner.entity.SysUser; 16 import com.lframework.starter.web.inner.entity.SysUser;
  17 +import com.lframework.starter.web.inner.service.system.SysDeptService;
16 import com.lframework.starter.web.inner.service.system.SysRoleService; 18 import com.lframework.starter.web.inner.service.system.SysRoleService;
17 import com.lframework.starter.web.inner.service.system.SysUserService; 19 import com.lframework.starter.web.inner.service.system.SysUserService;
18 import com.lframework.xingyun.basedata.entity.BreedRelationship; 20 import com.lframework.xingyun.basedata.entity.BreedRelationship;
@@ -64,6 +66,8 @@ public class SupplierQuotationProjectQuoteServiceImpl @@ -64,6 +66,8 @@ public class SupplierQuotationProjectQuoteServiceImpl
64 @Resource 66 @Resource
65 private SysRoleService sysRoleService; 67 private SysRoleService sysRoleService;
66 @Resource 68 @Resource
  69 + private SysDeptService sysDeptService;
  70 + @Resource
67 private BreedRelationshipService breedRelationshipService; 71 private BreedRelationshipService breedRelationshipService;
68 @Resource 72 @Resource
69 private ApplicationEventPublisher applicationEventPublisher; 73 private ApplicationEventPublisher applicationEventPublisher;
@@ -156,6 +160,13 @@ public class SupplierQuotationProjectQuoteServiceImpl @@ -156,6 +160,13 @@ public class SupplierQuotationProjectQuoteServiceImpl
156 if (beforeBidTime && CollectionUtil.isNotEmpty(list)) { 160 if (beforeBidTime && CollectionUtil.isNotEmpty(list)) {
157 list.forEach(v -> v.setPrice(null)); 161 list.forEach(v -> v.setPrice(null));
158 } 162 }
  163 + for (SupplierQuotationProjectQuote quote : list) {
  164 + List<SysDept> purchaseDept = sysDeptService.getPurchaseDept(quote.getSupplierId());
  165 + if (CollectionUtil.isNotEmpty(purchaseDept)) {
  166 + quote.setPurchaseDepartment(purchaseDept.get(0).getId());
  167 + quote.setPurchaseDepartmentName(purchaseDept.get(0).getName());
  168 + }
  169 + }
159 return list; 170 return list;
160 } 171 }
161 172