销售合同添加销售部门

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -90,7 +90,12 @@ public class ContractSelectDto extends BaseSelectDto {
     private Integer isLoss;
 
     /**
-     * 归属公司id
+     * 生产公司id
      */
     private Long companyId;
+
+    /**
+     * 销售部门id
+     */
+    private Long deptId;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -226,9 +226,14 @@ public class ContractVo extends Contract {
     List<ContractBudgetVo.GrossProfitInfo> grossProfitInfoList;
 
     /**
-     * 归属公司名称
+     * 生产公司名称
      */
     private String companyName;
 
+    /**
+     * 销售部门名称
+     */
+    private String deptName;
+
 }
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -335,8 +335,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
             wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
         }
-        //归属公司id过滤
-        wrapper.eq(Contract::getCompanyId, dto.getCompanyId());
+        //生产公司id过滤
+        wrapper.eq("t1", Contract::getCompanyId, dto.getCompanyId());
+        //销售部门id过滤
+        wrapper.eq("t1", Contract::getDeptId, dto.getDeptId());
 
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             List<Long> corporationIds = corporationService.listObject(Corporation::getId, q -> q.like(Corporation::getName, dto.getKeyword()));
@@ -403,8 +405,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (CollectionUtils.isEmpty(list)) {
             return page;
         }
-        //获取归属公司
-        List<SysDept> companyList = deptService.list(Wrappers.<SysDept>query().eq("type", 0));
+        //获取部门列表
+        List<SysDept> companyList = deptService.list();
         Map<Long, String> companyMap = companyList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
 
         //获取合同类型字典内容
@@ -452,9 +454,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             //获取合同类型字典内容
             p.setContractTypeVal(contractTypeStatusDic.get(p.getContractType()));
 
-            //赋值归属公司
+            //赋值生产公司
             p.setCompanyName(companyMap.get(p.getCompanyId()));
 
+            //赋值销售部门
+            p.setDeptName(companyMap.get(p.getDeptId()));
+
         }
 
         // 赋值流程id