楚江ERP：合同框架v2

@@ -51,6 +51,12 @@ public class QueryContractFrameworkBo extends BaseBo<ContractFramework> {
     private String company;
     private String company;
 
 
     /**
     /**
+     * 所属单位名称
+     */
+    @ApiModelProperty("所属单位名称")
+    private String companyName;
+
+    /**
      * 品种id
      * 品种id
      */
      */
     @ApiModelProperty("品种")
     @ApiModelProperty("品种")

@@ -7,6 +7,8 @@ import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.ProductVariety;
 import com.lframework.xingyun.basedata.entity.ProductVariety;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
@@ -50,6 +52,10 @@ public class ContractFrameworkController extends DefaultBaseController {
     private ProductVarietyService productVarietyService;
     private ProductVarietyService productVarietyService;
     @Autowired
     @Autowired
     private CustomerService customerService;
     private CustomerService customerService;
+    @Autowired
+    private SysDataDicItemService sysDataDicItemService;
+
+    private static final String SUPPLIER_DIC_CODE = "SUPPLIER";
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -92,6 +98,8 @@ public class ContractFrameworkController extends DefaultBaseController {
                     .collect(Collectors.toMap(Customer::getId, Function.identity())));
                     .collect(Collectors.toMap(Customer::getId, Function.identity())));
         }
         }
 
 
+        Map<String, String> sysDataDicItemMap = CollectionUtils.emptyIfNull(sysDataDicItemService.findByDicCode(SUPPLIER_DIC_CODE))
+                .stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
         results.forEach(bo -> {
         results.forEach(bo -> {
             if (bo == null) return;
             if (bo == null) return;
 
 
@@ -104,6 +112,10 @@ public class ContractFrameworkController extends DefaultBaseController {
                 Customer customer = customerMap.get(bo.getCustomerId());
                 Customer customer = customerMap.get(bo.getCustomerId());
                 bo.setCustomerName(customer != null ? customer.getName() : "");
                 bo.setCustomerName(customer != null ? customer.getName() : "");
             }
             }
+
+            if (StringUtils.isNotBlank(bo.getCompany())) {
+                bo.setCompanyName(sysDataDicItemMap.get(bo.getCompany()));
+            }
         });
         });
 
 
         boPageResult.setDatas(results);
         boPageResult.setDatas(results);
@@ -141,7 +153,8 @@ public class ContractFrameworkController extends DefaultBaseController {
         Customer customer = customerService.findById(customerId);
         Customer customer = customerService.findById(customerId);
         result.setMaterialTypeName(productVariety != null ? productVariety.getName() : "");
         result.setMaterialTypeName(productVariety != null ? productVariety.getName() : "");
         result.setCustomerName(customer != null ? customer.getName() : "");
         result.setCustomerName(customer != null ? customer.getName() : "");
-
+        SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(SUPPLIER_DIC_CODE, result.getCompany());
+        result.setCompanyName(sysDataDicItem != null ? sysDataDicItem.getName() : "");
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }