业务员过滤

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailServiceImpl.java

@@ -27,6 +27,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,10 +66,7 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
     @Override
     public Page<PackDetailVo> getPage(PackDetailSelectDto dto) {
         IWrapper<PackDetail> wrapper = getWrapper();
-        SysUser sysUser = iSysUserService.getById(SecurityUtils.getUserId());
-        if(ObjectUtil.isEmpty(sysUser)){
-            throw new ServiceException("用户异常");
-        }
+        SysUser sysUser = UserUtil.getUserInfo();
         if(StringUtils.isEmpty(sysUser.getUserCode())){//不是业务员看所有
             return pageCommon(dto, wrapper);
         }else{//是业务员
@@ -76,7 +74,7 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
             if (authIdList.size() == 0) {
                 return new Page<>();
             }
-            wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
+            wrapper.in("pd.customerIds", authIdList);
             return pageCommon(dto, wrapper);
         }
     }

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

@@ -266,6 +266,8 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         ContractVo contractVo = contractService.getSalesTotal(dto.getId());
         map.put("contractVo", contractVo);
 
+
+
         //查询这个客户的报价次数
         Integer count = this.getCount(dto.getId());
         DynamicDataSourceContextHolder.poll();

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

@@ -74,15 +74,40 @@
 
     <select id="getSalesTotal" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
         SELECT
-            SUM(amount) amount,
-            currency,
-            count(*) contractCount
+            SUM( amount ),
+            SUM( contractCount )
         FROM
-            contract
-        WHERE
-            buy_corporation_id = #{id} and status = 30 and del_flag  = 0
-        GROUP BY
-            buy_corporation_id
+            (
+                SELECT
+                    SUM( amount * rate ) amount,
+                    count(*) contractCount
+                FROM
+                    contract
+                WHERE
+                    buy_corporation_id = #{id}
+                  AND STATUS BETWEEN 0
+                    AND 87
+                  AND is_show != 1
+		AND is_change = 0
+		AND del_flag = 0
+                GROUP BY
+                    buy_corporation_id UNION ALL
+                SELECT
+                    SUM( amount * rate ) amount,
+                    count(*) contractCount
+                FROM
+                    sample
+                WHERE
+                    buy_corporation_id = #{id}
+                  AND STATUS BETWEEN 0
+                  AND 87
+                  AND is_show != 1
+                  AND is_change = 0
+                  AND del_flag = 0
+                GROUP BY
+                    buy_corporation_id
+            ) t1
+
     </select>
 
     <select id="getAmount" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">

hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -5,6 +5,7 @@
         select *
         from (SELECT
                      GROUP_CONCAT( t1.id ) AS ids,
+                     (select GROUP_CONCAT(buy_corporation_id) from contract WHERE id in (contract_ids)) AS customerIds,
                      t1.id,
                      t1.pack_id,
                      t1.waybill_code,