Explorar el Código

Merge branch 'V2.0.1' into test

zhaoxian hace 3 años
padre
commit
8c32bcb002

+ 8 - 6
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/ManagerSaleValueMapper.xml

@@ -243,14 +243,14 @@
     <select id="getWeekly" resultType="Long">
         SELECT IFNULL(weekly_goal_value, 0)
         FROM `jeecg-boot`.sys_manager_sale_value
-        WHERE manage_id = #{userId}
+        WHERE user_id = #{userId}
           AND media_id = #{mediaId}
           AND company_id = #{companyId}
     </select>
     <select id="getMonthly" resultType="Long">
         SELECT IFNULL(monthly_goal_value, 0)
         FROM `jeecg-boot`.sys_manager_sale_value
-        WHERE manage_id = #{userId}
+        WHERE user_id = #{userId}
           AND media_id = #{mediaId}
           AND company_id = #{companyId}
     </select>
@@ -445,7 +445,8 @@
     </select>
 
     <select id="queryKsHourProjectTop" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
+        SELECT *, (@i:=@i+1) as 'number' FROM
+        (SELECT
         t1.project_id as 'projectId',
         t1.project_name as 'projectName',
         ( SELECT realname FROM `jeecg-boot`.sys_user us WHERE us.id = t1.sale_id ) AS 'saleName',
@@ -494,12 +495,13 @@
         t1.project_id
         ORDER BY
         SUM( t1.charge ) DESC
-
+        ) t ,(SELECT @i:=0) i
     </select>
 
 
     <select id="queryTtHourProjectTop" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
+        SELECT *, (@i:=@i+1) as 'number' FROM
+        (SELECT
         t1.project_id as 'projectId',
         t1.project_name as 'projectName',
         ( SELECT realname FROM `jeecg-boot`.sys_user us WHERE us.id = t1.sale_id ) AS 'saleName',
@@ -549,7 +551,7 @@
         t1.project_id
         ORDER BY
         SUM( t1.cost ) DESC
-
+        ) t ,(SELECT @i:=0) i
     </select>
 
 

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

@@ -91,7 +91,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             data.put("monthlyGoalValue", monthly);
             result = Result.ok(data);
             //分公司总经理
-        } else if ("CompanyManager".equals(roleCode)) {
+        } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
             //账户集合
             List<Long> accountIds = baseMapper.getCompanyAccountIds(companyId, mediaId);
             JSONObject data = getManagerData(accountIds, userId, mediaId, companyId);
@@ -163,7 +163,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         QueryWrapper<ManagerSaleValue> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("company_id", sale.getCompanyId());
         queryWrapper.eq("media_id", sale.getMediaId());
-        queryWrapper.eq("manage_id", sale.getUserId());
+        queryWrapper.eq("user_id", sale.getUserId());
         ManagerSaleValue one = this.getOne(queryWrapper);
         if (Check.isNull(one)) {
             sale.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -215,7 +215,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
 
             }
             //分公司总经理
-        } else if ("CompanyManager".equals(roleCode)) {
+        } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
             if (startTime.equals(endTime)) {
                 data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime);
             } else {
@@ -340,7 +340,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 return getProjectDailyCharges(projectIds, mediaId, startTime, endTime, pageNo, pageSize);
             }
             //分公司总经理
-        } else if ("CompanyManager".equals(roleCode)) {
+        } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
             List<Long> projectIds = baseMapper.querySalesDirectorProjectIds(companyId, mediaId, null);
             if (startTime.equals(endTime)) {
                 return getProjectDailyCharges(projectIds, mediaId, startTime, null, pageNo, pageSize);

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java

@@ -37,5 +37,7 @@ public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 
     JSONArray getIdListByProject(Long projectId);
 
+    List<MaterialInfo> getListByProduct(@Param("productId") Long productId);
+
     // List<MaterialInfo> getListByParams(String tagCode, String type, Integer status, String materialName, String code, String startDate, String endDate, List<Long> projectIds, String ascription, String clipId, String shotId, String planId, Integer offlineFlag);
 }

+ 6 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml

@@ -190,4 +190,10 @@
 
     </select>
 
+    <select id="getListByProduct" resultType="cn.com.ctop.common.module.entity.MaterialInfo">
+        select *  from ctop_material_info
+        where product_id = #{productId}
+        and status = 1
+    </select>
+
 </mapper>

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -86,4 +86,6 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
     void correlationUploadV2(JSONObject json);
 
     JSONArray checkArrayCode(JSONArray array);
+
+    List<MaterialInfo> getListByProduct(Long productId);
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -645,6 +645,11 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return resultArray;
     }
 
+    @Override
+    public List<MaterialInfo> getListByProduct(Long productId) {
+        return baseMapper.getListByProduct(productId);
+    }
+
     /**
      * 素材库关联上传素材 1
      *