Kaynağa Gözat

Merge branch 'test'

yangzian 3 yıl önce
ebeveyn
işleme
86ef5f7327

+ 1 - 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -227,7 +227,7 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/importPolicyController/importPolicyInit", "anon");
         //filterChainDefinitionMap.put("/settLementController/**", "anon");
-        filterChainDefinitionMap.put("/settLementFileController/**", "anon");
+        //filterChainDefinitionMap.put("/settLementFileController/**", "anon");
 
         filterChainDefinitionMap.put("/ctop/projectMember/**", "anon");
         filterChainDefinitionMap.put("/agent/**", "anon");

+ 43 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.JsonObject;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.shiro.SecurityUtils;
@@ -42,6 +43,7 @@ import org.jeecg.ctop.finance.policy.utils.Check;
 import org.jeecg.ctop.finance.policy.utils.ListPageUtil;
 import org.jeecg.ctop.finance.settlement.entity.vo.ProfitReportBytedanceVo;
 import org.jeecg.ctop.finance.settlement.entity.vo.ProfitReportKuaiShouVo;
+import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
 import org.jeecg.ctop.finance.settlement.service.serviceImpl.ReportSettlementServiceImpl;
 import org.jeecg.modules.ctop.service.IMaterialReportOverViewService;
 import org.jeecg.modules.system.service.ISysRoleService;
@@ -929,6 +931,11 @@ public class CwjsPolicyInfoController {
   }
 
 
+	 /**
+	  * 提示政策审核任务(接口废弃)
+	  * 在定时任务中使用-job为 cwjsPolicyApprovedNoticeWxJob
+	  * @return
+	  */
   @GetMapping(value = "/weiXinNotice")
   public Result weiXinNotice(){
 	  CwjsPolicyInfo cwjsPolicyInfo = new CwjsPolicyInfo();
@@ -1050,4 +1057,40 @@ public class CwjsPolicyInfoController {
 
 
 
+
+
+	 /**
+	  * 查询 结算单 没有上传账户图片的账户信息
+	  * @param productId 产品id
+	  * @param projectId 项目id
+	  * @param uploadYears 年-月
+	  * @param mediaId 媒体类型 1-头条 2-快手 3-头条内广 4-快手内广
+	  * @return
+	  */
+	 @ApiOperation(value="查询结算单没有上传账户图片的账户信息", notes="查询结算单没有上传账户图片的账户信息")
+	 @GetMapping(value = "/getSettlementNoPictureAccountList")
+	 public Result getSettlementNoPictureAccountList(@RequestParam(name="productId") String productId,
+								@RequestParam(name="projectId") String projectId,
+								@RequestParam(name="uploadYears") String uploadYears,
+								@RequestParam(name="mediaId") String mediaId,
+								@RequestParam(name="userId") String userId,
+								@RequestParam(name="pageNo") Integer pageNo,
+								@RequestParam(name="pageSize") Integer pageSize){
+		 SettlementFileParamsVo paramsVo = new SettlementFileParamsVo();
+		 paramsVo.setProductId(productId);
+		 paramsVo.setProjectId(projectId);
+		 paramsVo.setUploadYears(uploadYears);
+		 paramsVo.setMediaId(Integer.valueOf(mediaId));
+		 paramsVo.setUserId(userId);
+		 paramsVo.setPageNo(pageNo);
+		 paramsVo.setPageSize(pageSize);
+		 return cwjsPolicyInfoService.getSettlementNoPictureAccountList(paramsVo);
+	 }
+
+
+
+
+
+
+
  }

+ 18 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyInfoMapper.java

@@ -74,6 +74,24 @@ public interface CwjsPolicyInfoMapper extends BaseMapper<CwjsPolicyInfo> {
      //政策作废 修改状态
      void updatePolicyToVOidById(@Param("policyId") String policyId,@Param("delReason") String delReason);
 
+    /**
+     * 查询 结算单 没有上传账户图片的账户信息
+     * @param productId 产品id
+     * @param projectId 项目id
+     * @param uploadYears 年-月
+     * @param mediaIds 媒体类型 1-头条 2-快手 3-头条内广 4-快手内广
+     * @return
+     */
+    List<JSONObject> getSettlementNoPictureAccountList(@Param("productId") String productId,
+                                                            @Param("projectId") String projectId,
+                                                            @Param("uploadYears") String uploadYears,
+                                                            @Param("mediaIds") List<Integer> mediaIds);
+
+    List<JSONObject> getSettlementNoPictureAccountAgentList(@Param("productId") String productId,
+                                                            @Param("projectId") String projectId,
+                                                            @Param("uploadYears") String uploadYears,
+                                                            @Param("accountIds") List<String> accountIds);
+
 
 
 

+ 75 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -460,6 +460,81 @@
 
 
 
+    <!-- 查询 结算单 没有上传账户图片的账户信息  -->
+    <select id="getSettlementNoPictureAccountList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            u.account_id accountId,
+            u.auth_name accountName,
+            u.user_name operateUserName
+        FROM
+            ctop_user_allocation u
+        WHERE
+            u.project_id = #{projectId}
+          AND u.account_status = 0
+        <if test="mediaIds != null and mediaIds.size() > 0">
+            AND u.media_id in
+            <foreach item="item" index="index" collection="mediaIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+          AND u.account_id NOT IN (
+            SELECT
+                c.account_id
+            FROM
+                `ctop_cwjs_settlement_file_info` c
+            WHERE
+                c.del_flag = 0
+              AND c.product_id = #{productId}
+            <if test="mediaIds != null and mediaIds.size() > 0">
+                AND c.media_id in
+                <foreach item="item" index="index" collection="mediaIds" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+              AND c.upload_years = #{uploadYears}
+            GROUP BY
+                c.account_id
+        )
+        ORDER BY
+            u.auth_name
+    </select>
+    <!-- 查询 结算单 没有上传账户图片的账户信息  过滤 消耗为0的账户-->
+    <select id="getSettlementNoPictureAccountAgentList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            u.account_id accountId,
+            u.auth_name accountName,
+            u.user_name operateUserName
+        FROM
+            ctop_user_allocation u
+        WHERE
+            u.project_id = #{projectId}
+        <if test="accountIds != null and accountIds.size() > 0">
+            AND u.account_id in
+            <foreach item="item" index="index" collection="accountIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+          AND u.account_id NOT IN (
+            SELECT
+                c.account_id
+            FROM
+                `ctop_cwjs_settlement_file_info` c
+            WHERE
+                c.del_flag = 0
+              AND c.product_id = #{productId}
+              AND c.upload_years = #{uploadYears}
+            GROUP BY
+                c.account_id
+        )
+        ORDER BY
+            u.auth_name
+    </select>
+
+
+
+
+
 
 
 

+ 7 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsPolicyInfoService.java

@@ -3,10 +3,12 @@ package org.jeecg.ctop.finance.policy.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
 
 import java.util.List;
 import java.util.Map;
@@ -50,4 +52,9 @@ public interface ICwjsPolicyInfoService extends IService<CwjsPolicyInfo> {
     Result toVoidpolicy(String policyId,String delReason);
 
 
+
+
+    Result getSettlementNoPictureAccountList(SettlementFileParamsVo paramsVo);
+
+
 }

+ 43 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -4,10 +4,12 @@ import android.widget.RelativeLayout;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.mapper.ProductMapper;
 import cn.com.ctop.common.module.mapper.SysUserMapper;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.util.DateUtils;
@@ -17,7 +19,10 @@ import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyInfoMapper;
 import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyProductMapper;
 import org.jeecg.ctop.finance.policy.service.ICwjsPolicyInfoService;
 import org.jeecg.ctop.finance.policy.utils.Check;
+import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
 import org.jeecg.ctop.finance.settlement.mapper.CwjsProfitMapper;
+import org.jeecg.ctop.finance.settlement.mapper.ReportSettlementMapper;
+import org.jeecg.ctop.finance.settlement.service.IReportSettlementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -273,5 +278,43 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
         return Result.successMsg("政策作废成功",null);
     }
 
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private IReportSettlementService reportSettlementService;
+
+    @Resource
+    private ReportSettlementMapper reportSettlementMapper;
+
+   @Override
+    public Result getSettlementNoPictureAccountList(SettlementFileParamsVo paramsVo) {
+       SysUser user = userService.getById(paramsVo.getUserId());
+       //查询账户数量
+       List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
+
+       if (Check.isNull(accountIds)){
+           return Result.errorMsg("未上传结算单账户列表查询为空。");
+       }
+
+
+       //过滤消耗为0 的账户 1-头条 2-快手
+       if (paramsVo.getMediaId().equals(1)){
+           accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
+       }else if (paramsVo.getMediaId().equals(2)){
+           accountIds = reportSettlementMapper.getAccountIdKuaiShouRepeat(accountIds,paramsVo.getUploadYears());
+       }
+
+       //过滤以上传的账户
+       //List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountList(productId,projectId,uploadYears,mediaIds);
+
+
+
+       PageHelper.startPage(paramsVo.getPageNo(), paramsVo.getPageSize());
+       List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountAgentList(paramsVo.getProductId(),paramsVo.getProjectId(),paramsVo.getUploadYears(),accountIds);
+       PageInfo<JSONObject> pageInfo = new PageInfo<>(list);
+       return Result.successMsg("未上传结算单账户查询成功。",pageInfo);
+    }
+
 
 }

+ 5 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/SettlementFileParamsVo.java

@@ -81,4 +81,9 @@ public class SettlementFileParamsVo implements Serializable {
     private Set<String> operatorUserIds;
     private Set<String> saleUserIds;
 
+    private Integer pageNo;
+    private Integer pageSize;
+
+
+
 }