feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位

shiyunteng

昨天 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java

@@ -69,7 +69,6 @@
   public R contractAmountAnalysis(AnalysisCommonDTO commonDTO) {
      List<Long> compIds = new ArrayList<>();
      compIds.add(Long.valueOf(sgb));
      compIds.add(Long.valueOf(smj));
      compIds.add(Long.valueOf(tfgs));
      compIds.add(Long.valueOf(ymj));
      compIds.add(Long.valueOf(jxc));
@@ -477,11 +476,12 @@
         return R.failed("行业字典分类获取异常");
      }
      List<Long> compIds = new ArrayList<>();
      compIds.add(Long.valueOf(sgb));
      compIds.add(Long.valueOf(smj));
      compIds.add(Long.valueOf(sgb));
      compIds.add(Long.valueOf(jxc));
      compIds.add(Long.valueOf(tfgs));
      compIds.add(Long.valueOf(ymj));
      compIds.add(Long.valueOf(jxc));


      List<AgingAnalysisVo> result = new ArrayList<>();
      AgingQueryDTO queryDTO = new AgingQueryDTO();
@@ -576,11 +576,11 @@
   public R agingAnalysis(AnalysisCommonDTO commonDTO) {
      if (commonDTO.getAgingType().equals("2")) {
         List<Long> compIds = new ArrayList<>();
         compIds.add(Long.valueOf(sgb));
         compIds.add(Long.valueOf(smj));
         compIds.add(Long.valueOf(sgb));
         compIds.add(Long.valueOf(jxc));
         compIds.add(Long.valueOf(tfgs));
         compIds.add(Long.valueOf(ymj));
         compIds.add(Long.valueOf(jxc));
         List<AgingAnalysisVo> result = new ArrayList<>();
         AgingQueryDTO queryDTO = new AgingQueryDTO();
         List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalShip(null);
@@ -591,7 +591,7 @@
            }
            SysDept dept = r.getData();
            AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
            agingAnalysisVo.setCompanyName(dept.getOrgName());
            agingAnalysisVo.setCompanyName(dept.getName());
            queryDTO.setCompanyId(dept.getDeptId());
            List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalShip(queryDTO);
            //补全数据
@@ -688,7 +688,7 @@
            }
            SysDept dept = r.getData();
            AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
            agingAnalysisVo.setCompanyName(dept.getOrgName());
            agingAnalysisVo.setCompanyName(dept.getName());
            queryDTO.setCompanyId(dept.getDeptId());
            List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalInvoice(queryDTO);
            //补全数据
@@ -867,11 +867,12 @@
   @Override
   public R agingAnalysisTotalScale(AnalysisCommonDTO commonDTO) {
      List<Long> compIds = new ArrayList<>();
      compIds.add(Long.valueOf(sgb));
      compIds.add(Long.valueOf(smj));
      compIds.add(Long.valueOf(sgb));
      compIds.add(Long.valueOf(tfgs));
      compIds.add(Long.valueOf(ymj));
      compIds.add(Long.valueOf(jxc));
      compIds.add(Long.valueOf(ymj));

      List<AgingAnalysisVo> result = new ArrayList<>();
      AgingQueryDTO queryDTO = new AgingQueryDTO();
      List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalScale(null);
@@ -882,7 +883,7 @@
         }
         SysDept dept = r.getData();
         AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
         agingAnalysisVo.setCompanyName(dept.getOrgName());
         agingAnalysisVo.setCompanyName(dept.getName());
         queryDTO.setCompanyId(dept.getDeptId());
         List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalScale(queryDTO);
         //补全数据
@@ -966,95 +967,99 @@
   @Override
   public R homeZbjt() {
      List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>();
      //合同签订 sgb smj jxc tfgs ymj
      HomeZbjtVo htqd = contractMapper.homeZbjt();
      homeZbjtVoList.add(htqd);
      //回款
      HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
      homeZbjtVoList.add(hk);

      //出货
      HomeZbjtVo ch = contractOutBoundMapper.homeZbjt();
      homeZbjtVoList.add(ch);
//      HomeZbjtVo ch = contractOutBoundMapper.homeZbjt();
//      homeZbjtVoList.add(ch);
      //只保留销售收入 回款 新增合同
      //开票
      HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
      homeZbjtVoList.add(kp);
      //回款
      HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
      homeZbjtVoList.add(hk);
      //合同签订 sgb smj jxc tfgs ymj
      HomeZbjtVo htqd = contractMapper.homeZbjt();
      homeZbjtVoList.add(htqd);
      //赊销产生值 今天发货加今天开票额
//      if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){
//         HomeZbjtVo sxsy = ch.add(kp);
//         homeZbjtVoList.add(sxsy);
//      }else if (ObjUtil.isNotNull(ch)&&ObjUtil.isNull(kp)){
         homeZbjtVoList.add(ch);
//         homeZbjtVoList.add(ch);
//      }else if (ObjUtil.isNull(ch)&&ObjUtil.isNotNull(kp)){
//         homeZbjtVoList.add(kp);
//      }else {
//         homeZbjtVoList.add(new HomeZbjtVo());
//      }
      //赊销累计剩余值 今日发货且没开票的出货
      HomeZbjtVo sx = contractOutBoundMapper.homeZbjtSX();
      homeZbjtVoList.add(sx);
      HomeZbjtVo yq = currentOverdueMapper.homeZbjt();
      //逾期累计剩余 今日产生逾期 含历史
      HomeZbjtVo ls = historyOverdueMapper.homeZbjt();
      if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
         homeZbjtVoList.add(yq.add(ls));
      }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
         homeZbjtVoList.add(ls);
      }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
         homeZbjtVoList.add(yq);
      }else {
         homeZbjtVoList.add(new HomeZbjtVo());
      }
      //逾期产生值 今天产生-今天已付

      homeZbjtVoList.add(yq);
//      HomeZbjtVo sx = contractOutBoundMapper.homeZbjtSX();
//      homeZbjtVoList.add(sx);
//      HomeZbjtVo yq = currentOverdueMapper.homeZbjt();
//      //逾期累计剩余 今日产生逾期 含历史
//      HomeZbjtVo ls = historyOverdueMapper.homeZbjt();
//      if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
//         homeZbjtVoList.add(yq.add(ls));
//      }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
//         homeZbjtVoList.add(ls);
//      }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
//         homeZbjtVoList.add(yq);
//      }else {
//         homeZbjtVoList.add(new HomeZbjtVo());
//      }
//      //逾期产生值 今天产生-今天已付
//
//      homeZbjtVoList.add(yq);
      return R.ok(homeZbjtVoList);
   }

   @Override
   public R homeZgs() {
      List<HomeZgsVo> homeZbjtVoList = new ArrayList<>();
      //合同签订 华北  西北  东北  海外
      HomeZgsVo htqd = contractMapper.homeZgs(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(htqd);
      //回款
      HomeZgsVo hk = paymentSlipMapper.homeZgs(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(hk);
      //出货
      HomeZgsVo ch = contractOutBoundMapper.homeZgs(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(ch);

//      //出货
//      HomeZgsVo ch = contractOutBoundMapper.homeZgs(SecurityUtils.getUser().getCompId());
//      homeZbjtVoList.add(ch);
      //开票
      HomeZgsVo kp = contractInvoiceMapper.homeZgs(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(kp);
      //回款
      HomeZgsVo hk = paymentSlipMapper.homeZgs(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(hk);
      //合同签订 华北  西北  东北  海外
      HomeZgsVo htqd = contractMapper.homeZgs(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(htqd);

      //赊销产生值
//      if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){
//         HomeZgsVo sxsy = ch.add(kp);
//         homeZbjtVoList.add(sxsy);
//      }else if (ObjUtil.isNotNull(ch)&&ObjUtil.isNull(kp)){
         homeZbjtVoList.add(ch);
//         homeZbjtVoList.add(ch);
//      }else if (ObjUtil.isNull(ch)&&ObjUtil.isNotNull(kp)){
//         homeZbjtVoList.add(kp);
//      }else {
//         homeZbjtVoList.add(new HomeZgsVo());
//      }
      //赊销累计剩余值
      HomeZgsVo sx = contractOutBoundMapper.homeZgsSX(SecurityUtils.getUser().getCompId());
      homeZbjtVoList.add(sx);

      HomeZgsVo yq = currentOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());

      //逾期产生值
      HomeZgsVo ls = historyOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
      if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
         homeZbjtVoList.add(yq.add(ls));
      }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
         homeZbjtVoList.add(ls);
      }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
         homeZbjtVoList.add(yq);
      }else {
         homeZbjtVoList.add(new HomeZgsVo());
      }
      //逾期累计剩余
      homeZbjtVoList.add(yq);
//      HomeZgsVo sx = contractOutBoundMapper.homeZgsSX(SecurityUtils.getUser().getCompId());
//      homeZbjtVoList.add(sx);
//
//      HomeZgsVo yq = currentOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
//
//      //逾期产生值
//      HomeZgsVo ls = historyOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
//      if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
//         homeZbjtVoList.add(yq.add(ls));
//      }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
//         homeZbjtVoList.add(ls);
//      }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
//         homeZbjtVoList.add(yq);
//      }else {
//         homeZbjtVoList.add(new HomeZgsVo());
//      }
//      //逾期累计剩余
//      homeZbjtVoList.add(yq);
      return R.ok(homeZbjtVoList);
   }

@@ -1321,4 +1326,32 @@
      }
      return R.ok(homeOverdueVos);
   }

   @Override
   public R homeZgsColum() {
      R<List<SysDictItem>> r = remoteDictService.getDictByType("province");
      List<SysDictItem> items = r.getData();
      if (CollUtil.isEmpty(items)){
         return R.failed("客商省份字典分类获取异常");
      }
      List<HomeZgsData> list = new ArrayList<>();
      List<String> contractProvinces = contractMapper.homeZgsColum(SecurityUtils.getUser().getCompId());
      if (CollUtil.isNotEmpty(contractProvinces)){
         contractProvinces.stream().forEach(province->{
            HomeZgsData homeZgsData = contractInvoiceMapper.homeZgsData(SecurityUtils.getUser().getCompId(),province);
            SysDictItem result = items.stream()
                  .filter(item -> item != null && province.equals(item.getItemValue()))
                  .findFirst()
                  .orElse(null);
            homeZgsData.setProvinceCode(province);
            if (ObjUtil.isNotNull(result)){

               homeZgsData.setProvinceName(result.getLabel());
            }
            list.add(homeZgsData);
         });
         return R.ok(list);
      }
      return R.ok();
   }
}