浏览代码

供应链-首页

yumeng 7 月之前
父节点
当前提交
30ee864c08

+ 15 - 18
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KwaiXiaoDianReportController.java

@@ -8,10 +8,7 @@ import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.DateUtils;
 import com.ruixuan.isc.service.IKwaiXiaoDianReportService;
 import com.ruixuan.isc.service.IKwaixiaodianItemGetService;
-import com.ruixuan.system.service.ISysDeptService;
 import com.ruixuan.system.service.ISysRoleService;
-import com.ruixuan.system.service.ISysUserService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -77,12 +74,12 @@ public class KwaiXiaoDianReportController {
                 if (Check.isNull(courtshipPurchaseIds)) {
                     throw new Exception("此用户未查询到部门成员信息");
                 }
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
                 List<Long> courtshipPurchaseIds = new ArrayList<>();
                 courtshipPurchaseIds.add(userId);
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             }
 
@@ -154,12 +151,12 @@ public class KwaiXiaoDianReportController {
                 if (Check.isNull(courtshipPurchaseIds)) {
                     throw new Exception("此用户未查询到部门成员信息");
                 }
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
                 List<Long> courtshipPurchaseIds = new ArrayList<>();
                 courtshipPurchaseIds.add(userId);
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             }
 
@@ -238,12 +235,12 @@ public class KwaiXiaoDianReportController {
                 if (Check.isNull(courtshipPurchaseIds)) {
                     throw new Exception("此用户未查询到部门成员信息");
                 }
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
                 List<Long> courtshipPurchaseIds = new ArrayList<>();
                 courtshipPurchaseIds.add(userId);
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             }
 
@@ -307,12 +304,12 @@ public class KwaiXiaoDianReportController {
                 if (Check.isNull(courtshipPurchaseIds)) {
                     throw new Exception("此用户未查询到部门成员信息");
                 }
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
                 List<Long> courtshipPurchaseIds = new ArrayList<>();
                 courtshipPurchaseIds.add(userId);
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
+                List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
                 requestMap.put("itemIds", itemIds);
             }
 
@@ -441,9 +438,13 @@ public class KwaiXiaoDianReportController {
             requestMap.put("deptId", deptId);
             requestMap.put("type", type);
             String roleId = sysRoleService.getRoleBYUserId(userId);
-            if ("industry_sale".equals(roleId) || "industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { //   销售 查看自己的数据
+            if ("industry_sale".equals(roleId)) { //   销售 查看自己的数据
                 requestMap.put("userId", userId);
             }
+            if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) {
+                requestMap.put("courtshipPurchaseId", userId);
+            }
+
 
             Long start = DateUtils.strDateToInt(startDate);
             Long end = DateUtils.strDateToInt(endDate);
@@ -498,11 +499,8 @@ public class KwaiXiaoDianReportController {
                 if (Check.isNull(userIds)) {
                     throw new Exception("此用户未查询到部门成员信息");
                 }
-                List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(userIds);
-                if (Check.isNull(itemIds)) {
-                    throw new Exception("商品ID为空");
-                }
-                requestMap.put("itemIds", itemIds);
+                requestMap.put("userIds", userIds);
+
             } else if ("industry_sale".equals(roleId)) { //   销售 查看自己的数据
                 List<Long> userIds = new ArrayList<>();
                 userIds.add(userId);
@@ -516,7 +514,6 @@ public class KwaiXiaoDianReportController {
                 if (Check.isNull(courtshipPurchaseIds)) {
                     throw new Exception("此用户未查询到部门成员信息");
                 }
-
                 requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
                 List<Long> courtshipPurchaseIds = new ArrayList<>();

+ 20 - 11
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KwaixiaodianItemGetController.java

@@ -139,7 +139,7 @@ public class KwaixiaodianItemGetController extends BaseController {
 
 
     @GetMapping("/getShopList")
-    public JSONObject getShopList(Long userId) {
+    public JSONObject getShopList(Long userId, Long companyId) {
 
         JSONObject returnJson = new JSONObject();
         try {
@@ -147,13 +147,17 @@ public class KwaixiaodianItemGetController extends BaseController {
                 throw new Exception("请传入用户ID");
             }
             String roleId = sysRoleService.getRoleBYUserId(userId);
-            Long companyId = null;
+
+            Long requestCompanyId = null;
             if ("admin".equals(roleId)) { // 管理员查看所有
-                companyId = null;
+                if (!Check.isNull(companyId)) {
+                    requestCompanyId = companyId;
+                }
+
             } else {
-                companyId = kwaixiaodianItemGetService.getCompanyId(userId);
+                requestCompanyId = kwaixiaodianItemGetService.getCompanyId(userId);
             }
-            List<JSONObject> shopList = kwaixiaodianItemGetService.getShopList(companyId);
+            List<JSONObject> shopList = kwaixiaodianItemGetService.getShopList(requestCompanyId);
             returnJson.put("code", 200);
             returnJson.put("success", true);
             returnJson.put("data", shopList);
@@ -190,7 +194,6 @@ public class KwaixiaodianItemGetController extends BaseController {
     }
 
 
-
     @GetMapping("/getCourtshipPurchaseIds")
     public JSONObject getCourtshipPurchaseIds(Long userId) {
 
@@ -291,7 +294,7 @@ public class KwaixiaodianItemGetController extends BaseController {
 
 
     @GetMapping("/queryItemReport")
-    public TableDataInfo getDingPanMentorBusinessList(Long userId, String startDate, String endDate, String shopId, Long itemId, String itemTitle, Integer itemType) {
+    public TableDataInfo getDingPanMentorBusinessList(Long companyId, Long userId, String startDate, String endDate, String shopId, Long itemId, String itemTitle, Integer itemType) {
 
         TableDataInfo rspData = new TableDataInfo();
         try {
@@ -308,9 +311,12 @@ public class KwaixiaodianItemGetController extends BaseController {
 
             String roleId = sysRoleService.getRoleBYUserId(userId);
             if ("admin".equals(roleId)) { // 管理员查看所有
+                if (!Check.isNull(companyId)) {
+                    requestMap.put("companyId", companyId);
+                }
 
             } else if ("industry_admin".equals(roleId)) { // 供应链管理员查看所属公司
-                Long companyId = kwaixiaodianItemGetService.getCompanyId(userId);
+                companyId = kwaixiaodianItemGetService.getCompanyId(userId);
                 if (Check.isNull(companyId)) {
                     throw new Exception("此用户未查询到归属公司");
                 }
@@ -385,7 +391,7 @@ public class KwaixiaodianItemGetController extends BaseController {
 
 
     @GetMapping("/exportItemReport")
-    public void exportItemReport(HttpServletRequest request, HttpServletResponse response, Long userId, String startDate, String endDate, String shopId, Long itemId, String itemTitle, Integer itemType) throws IOException, ParseException {
+    public void exportItemReport(HttpServletRequest request, HttpServletResponse response, Long companyId, Long userId, String startDate, String endDate, String shopId, Long itemId, String itemTitle, Integer itemType) throws IOException, ParseException {
         Map<String, Object> requestMap = new HashMap<>();
 
         if (Check.isNull(userId)) {
@@ -400,9 +406,12 @@ public class KwaixiaodianItemGetController extends BaseController {
 
         String roleId = sysRoleService.getRoleBYUserId(userId);
         if ("admin".equals(roleId)) { // 管理员查看所有
-
+            if (!Check.isNull(companyId)) {
+                requestMap.put("companyId", companyId);
+            }
+            requestMap.put("companyId", companyId);
         } else if ("industry_admin".equals(roleId)) { // 供应链管理员查看所属公司
-            Long companyId = kwaixiaodianItemGetService.getCompanyId(userId);
+            companyId = kwaixiaodianItemGetService.getCompanyId(userId);
             if (Check.isNull(companyId)) {
                 return;
             }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KwaixiaodianItemGetMapper.java

@@ -40,4 +40,6 @@ public interface KwaixiaodianItemGetMapper {
     List<Long> getItemIdsByUserIds(@Param("userIds") List<Long> userIds);
 
     List<JSONObject> getCompanyList();
+
+    List<Long> getCourtshipPurchaseItemIdsByUserIds(@Param("courtshipPurchaseIds") List<Long> courtshipPurchaseIds);
 }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKwaixiaodianItemGetService.java

@@ -40,4 +40,6 @@ public interface IKwaixiaodianItemGetService {
     List<Long> getItemIdsByUserIds(List<Long> userIds);
 
     List<JSONObject> getCompanyList();
+
+    List<Long> getCourtshipPurchaseItemIdsByUserIds(List<Long> courtshipPurchaseIds);
 }

+ 5 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KwaixiaodianItemGetServiceImpl.java

@@ -245,6 +245,11 @@ public class KwaixiaodianItemGetServiceImpl implements IKwaixiaodianItemGetServi
         return mapper.getCompanyList();
     }
 
+    @Override
+    public List<Long> getCourtshipPurchaseItemIdsByUserIds(List<Long> courtshipPurchaseIds) {
+        return mapper.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
+    }
+
 
     private void replaceItemGetSku(JSONArray skuInfos) {
         try {

+ 27 - 18
ruixuan-live/src/main/resources/mapper/isc/KwaiXiaoDianReportMapper.xml

@@ -64,7 +64,7 @@
             and t1.stat_hour &lt;= #{nowHour}
         </if>
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -85,7 +85,7 @@
             and t1.stat_hour &lt;= #{nowHour}
         </if>
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -108,7 +108,7 @@
         </if>
 
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -151,7 +151,7 @@
         </if>
 
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -168,7 +168,7 @@
         </if>
 
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -194,7 +194,7 @@
         </if>
 
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND item_it in
+            AND item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -217,7 +217,7 @@
         </if>
 
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND item_it in
+            AND item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -274,7 +274,7 @@
             and t1.stat_hour &lt;= #{nowHour}
         </if>
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -293,7 +293,7 @@
             and t1.stat_hour &lt;= #{nowHour}
         </if>
         <if test='itemIds != null and itemIds.size() > 0'>
-            AND t1.item_it in
+            AND t1.item_id in
             <foreach collection="itemIds" item="item" separator=","
                      open="(" close=")">
                 #{item}
@@ -633,9 +633,13 @@
         <if test='nowHour != null and nowHour != ""'>
             and t1.stat_hour &lt;= #{nowHour}
         </if>
-        <if test='userId != null and userId != ""'>
+        <if test="userId != null">
             and t2.user_id = #{userId}
         </if>
+        <if test="courtshipPurchaseId != null">
+            and t2.courtship_purchase_id = #{courtshipPurchaseId}
+        </if>
+
         and t3.dept_id = #{deptId}
         group by t3.user_id) t
         left join (SELECT t3.user_id as 'userId',
@@ -644,10 +648,10 @@
         LEFT JOIN kwaixiaodian_item_get t2
         ON t1.company_id = t2.company_id AND t1.item_id = t2.item_id
         left join sys_user t3
-        <if test="type == '1'.toString()">
+        <if test="type != null and type == '1'.toString()">
             on t2.user_id = t3.user_id
         </if>
-        <if test="type == '2'.toString()">
+        <if test="type != null and type == '2'.toString()">
             on t2.courtship_purchase_id = t3.user_id
         </if>
         WHERE t1.stat_date &gt;= #{lastStart}
@@ -655,12 +659,15 @@
         <if test='nowHour != null and nowHour != ""'>
             and t1.stat_hour &lt;= #{nowHour}
         </if>
-        <if test='userId != null and userId != ""'>
+        <if test="userId != null">
             and t2.user_id = #{userId}
         </if>
+        <if test="courtshipPurchaseId != null">
+            and t2.courtship_purchase_id = #{courtshipPurchaseId}
+        </if>
         and t3.dept_id = #{deptId}
         group by t3.user_id) tt on t.userId = tt.userId
-        <if test="type == '1'.toString()">
+        <if test="type != null and type == '1'.toString()">
             left join (
             select t1.user_id as 'userId',
             SUM(CASE WHEN t1.item_type = 1 THEN 1 ELSE 0 END) AS 'zxOrderNum',
@@ -672,14 +679,15 @@
             %H:%i:%s')
             AND t1.data_create_time &lt;= str_to_date(concat(date_format(#{end}, '%Y-%m-%d'), '23:59:59'), '%Y-%m-%d
             %H:%i:%s')
-            <if test='userId != null and userId != ""'>
+            <if test="userId != null">
                 and t1.user_id = #{userId}
             </if>
+
             group by t1.user_id
             )
         </if>
 
-        <if test="type == '2'.toString()">
+        <if test=" type != null and type == '2'.toString()">
             left join (
             select t1.courtship_purchase_id as 'userId',
             (CASE WHEN t1.item_type = 1 THEN 1 ELSE 0 END) AS 'zxOrderNum',
@@ -691,8 +699,9 @@
             %H:%i:%s')
             AND t1.data_create_time &lt;= str_to_date(concat(date_format(#{end}, '%Y-%m-%d'), '23:59:59'), '%Y-%m-%d
             %H:%i:%s')
-            <if test='userId != null and userId != ""'>
-                and t1.courtship_purchase_id = #{userId}
+
+            <if test="courtshipPurchaseId != null">
+                and t1.courtship_purchase_id = #{courtshipPurchaseId}
             </if>
             group by t1.courtship_purchase_id
             )

+ 9 - 0
ruixuan-live/src/main/resources/mapper/isc/KwaixiaodianItemGetMapper.xml

@@ -571,6 +571,15 @@
         ORDER BY company_id
 
     </select>
+    <select id="getCourtshipPurchaseItemIdsByUserIds" resultType="java.lang.Long">
+        select item_id from kwaixiaodian_item_get where
+        1 = 1
+        and courtship_purchase_id in
+        <foreach collection="courtshipPurchaseIds" item="userId" separator="," open="(" close=")">
+            #{userId}
+        </foreach>
+        group by item_id
+    </select>
 
 
 </mapper>