销售合同业务员问题处理

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -118,6 +118,14 @@ public class SubscribeFlow extends FlowDelegate {
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
+
+        // 修改申购明细为驳回
+        subscribeDetailService.update(q -> q
+                .eq(SubscribeDetail::getSubscribeId, businessId)
+                .set(SubscribeDetail::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 
     @Override

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

@@ -6,7 +6,6 @@ import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
-import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -207,5 +206,10 @@ public class ContractVo extends Contract {
      */
     private Integer orderStatus;
 
+    /**
+     * 业务员名称
+     */
+    private String salesmanName;
+
 }
 

hx-sale/src/main/java/com/fjhx/sale/entity/sample/vo/SampleVo.java

@@ -2,7 +2,6 @@ package com.fjhx.sale.entity.sample.vo;
 
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.sale.entity.sample.po.Sample;
-import com.fjhx.sale.entity.sample.po.SampleShipment;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -91,4 +90,9 @@ public class SampleVo extends Sample {
      */
     private Long flowId;
 
+    /**
+     * 业务员名称
+     */
+    private String salesmanName;
+
 }

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

@@ -131,7 +131,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private CustomerService customerService;
 
     @Autowired
-    private ISysUserService iSysUserService;
+    private ISysUserService sysUserService;
 
     @Autowired
     private CorporationService corporationService;
@@ -369,6 +369,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                     p.setBuyCorporationName(customers == null ? null : customers.get(0).getName());
                     // 赋值客户标签
                     p.setTag(customers == null ? null : customers.get(0).getTag());
+                    //赋值业务员
+                    p.setUserName(p.getSalesmanName());
                 }
 
                 // 赋值交接单附件

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -32,7 +32,6 @@ import com.fjhx.mail.entity.personal.po.PersonalMailbox;
 import com.fjhx.mail.service.enterprise.EnterpriseDomainService;
 import com.fjhx.mail.service.enterprise.EnterpriseMailboxService;
 import com.fjhx.mail.service.personal.PersonalMailboxService;
-import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
@@ -53,7 +52,6 @@ import com.fjhx.sale.service.sample.SampleService;
 import com.fjhx.sale.service.sample.SampleShipmentService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.framework.config.ThreadPoolConfig;
@@ -121,7 +119,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     @Autowired
     private EhsdPurchaseService purchaseService;
     @Autowired
-    private ISysUserService iSysUserService;
+    private ISysUserService sysUserService;
 
     /**
      * 分页
@@ -186,6 +184,8 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
                     p.setBuyCorporationName(customers == null ? null : customers.get(0).getName());
                     //赋值客户标签
                     p.setTag(customers == null ? null : customers.get(0).getTag());
+                    //赋值业务员
+                    p.setUserName(p.getSalesmanName());
                 }
 
                 //赋值交接单附件

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -13,12 +13,15 @@
                          ELSE 10
                          END                                   AS refundStatusNew
               FROM (SELECT t1.*,
+                           us.nick_name                      salesmanName,
                            (SELECT IFNULL(SUM(IFNULL(cc.money_cny, IFNULL(cc.money, 0) * IFNULL(arw.rate, 1))), 0)
                             FROM claim_contract cc
                                      left join claim c on cc.claim_id = c.id
                                      LEFT JOIN bytesailing_account.account_running_water arw on c.business_id = arw.id
                             WHERE cc.contract_id = t1.id) AS sumClaimMoney
-                    FROM contract t1) t1) t1
+                    FROM contract t1
+                             left join bytesailing_customer.customer c on t1.buy_corporation_id = c.id
+                             left join bytesailing_base.sys_user us on c.user_id = us.user_id) t1) t1
             ${ew.customSqlSegment}
     </select>
 

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -189,16 +189,16 @@
 
     <select id="contractHandoverPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
         SELECT
-            t1.create_time AS ct,
-            t1.id,
-            t1.contract_id,
-            t1.product_id,
-            t2.`code` AS `contractCode`,
-            t2.user_name AS userName,
-            t2.version AS contractVersion,
-            t2.buy_corporation_id buyCorporationId,
-            t1.quantity,
-            <!-- 待采购数量-->
+        t1.create_time AS ct,
+        t1.id,
+        t1.contract_id,
+        t1.product_id,
+        t2.`code` AS `contractCode`,
+        us.nick_name AS userName,
+        t2.version AS contractVersion,
+        t2.buy_corporation_id buyCorporationId,
+        t1.quantity,
+        <!-- 待采购数量-->
             t1.expend_quantity AS expendQuantity,
             <!-- 交接单时间-->
             t3.sampleTime,
@@ -212,8 +212,11 @@
             contract_product t1
             LEFT JOIN contract t2 ON t1.contract_id = t2.id
             <!-- 列表中只显示存在交接单的数据 获取到交接单时间最单的一条-->
-            left join(SELECT business_id,create_time sampleTime from bytesailing_base.file_info GROUP BY business_id HAVING MAX(create_time)) t3 on
-            t2.id = t3.business_id
+        left join(SELECT business_id,create_time sampleTime from bytesailing_base.file_info GROUP BY business_id HAVING
+        MAX(create_time)) t3 on
+        t2.id = t3.business_id
+        left join bytesailing_customer.customer c on t2.buy_corporation_id = c.id
+        left join bytesailing_base.sys_user us on c.user_id = us.user_id
         ${ew.customSqlSegment}
     </select>
 

hx-sale/src/main/resources/mapper/sample/SampleMapper.xml

@@ -13,27 +13,30 @@
                          ELSE 10
                          END                                   AS refundStatusNew
               FROM (SELECT t1.*,
+                           us.nick_name                      salesmanName,
                            (SELECT IFNULL(SUM(IFNULL(cc.money_cny, IFNULL(cc.money, 0) * IFNULL(arw.rate, 1))), 0)
                             FROM claim_contract cc
                                      left join claim c on cc.claim_id = c.id
                                      LEFT JOIN bytesailing_account.account_running_water arw on c.business_id = arw.id
                             WHERE cc.contract_id = t1.id) AS sumClaimMoney
-                    FROM sample t1) t1) t1
+                    FROM sample t1
+                             left join bytesailing_customer.customer c on t1.buy_corporation_id = c.id
+                             left join bytesailing_base.sys_user us on c.user_id = us.user_id) t1) t1
             ${ew.customSqlSegment}
     </select>
 
     <select id="sampleHandoverList" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
         SELECT
-            t1.quantity,
-            t1.create_time AS ct,
-            t1.id,
-            t1.sample_id sampleId,
-            t1.product_id,
-            t2.`code` AS `contractCode`,
-            t2.user_name AS userName,
-            t2.versions AS contractVersion,
-            t2.buy_corporation_id buyCorporationId,
-            <!-- 需要采购的合同数量-->
+        t1.quantity,
+        t1.create_time AS ct,
+        t1.id,
+        t1.sample_id sampleId,
+        t1.product_id,
+        t2.`code` AS `contractCode`,
+        us.nick_name AS userName,
+        t2.versions AS contractVersion,
+        t2.buy_corporation_id buyCorporationId,
+        <!-- 需要采购的合同数量-->
             t1.expend_quantity AS expendQuantity,
             <!-- 交接单时间-->
             t3.sampleTime,
@@ -45,8 +48,11 @@
             sample_product t1
             LEFT JOIN sample t2 ON t1.sample_id = t2.id
             <!-- 列表中只显示存在交接单的数据 获取到交接单时间最单的一条-->
-            left join(SELECT business_id,create_time sampleTime from bytesailing_base.file_info GROUP BY business_id HAVING MAX(create_time)) t3 on
-            t2.id = t3.business_id
+        left join(SELECT business_id,create_time sampleTime from bytesailing_base.file_info GROUP BY business_id HAVING
+        MAX(create_time)) t3 on
+        t2.id = t3.business_id
+        left join bytesailing_customer.customer c on t2.buy_corporation_id = c.id
+        left join bytesailing_base.sys_user us on c.user_id = us.user_id
         ${ew.customSqlSegment}
     </select>
     <update id="updateSample" parameterType="com.fjhx.sale.entity.sample.po.Sample">