|
@@ -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);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|