platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/AgingQueryDTO.java
@@ -13,6 +13,8 @@ private String industryId; private String classId; /** * 账龄计算日期类型 * 1/约定时间 2/发货时间 3/开票时间 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -149,6 +149,9 @@ @Schema(description = "合同总价税率") private BigDecimal contractTax; @Schema(description = "经济事项 bip推送应收用") private String economicMatters; private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule; private List<ContractSubjectMatterAddDTO> contractSubjectMatter; platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java
@@ -7,6 +7,8 @@ private String mc; private String bm; private Integer childNum; } platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
@@ -129,5 +129,11 @@ @Column(columnDefinition = "bigint comment '销售模式'") private Long salesModel; @Schema(description = "erp企业名称") @Column(columnDefinition = "VARCHAR(128) comment 'erp企业名称'") private String erpCompanyName; @Schema(description = "erp企业编码") @Column(columnDefinition = "VARCHAR(64) comment 'erp企业编码'") private String erpCompanyCode; } platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -67,8 +67,8 @@ private Integer contractType; @Schema(description = "供应属性 0-成品 1-备件 2-大修 3-其他") @Column(columnDefinition = "tinyint(2) default 0 comment '供应属性 0-成品 1-备件 2-大修 3-其他'") private Integer supplyAttribute; @Column(columnDefinition = "varchar(16) default 0 comment '供应属性 0-成品 1-备件 2-大修 3-其他'") private String supplyAttribute; @Schema(description = "合同状态（0-草稿 1-已生效 2-已终止 3-已过期）") @Column(columnDefinition = "tinyint(2) default 0 comment '合同状态'") @@ -251,4 +251,8 @@ @Column(columnDefinition = "decimal(10,2) comment '开票通知在 个工作日内 一煤机采购合同用'") private BigDecimal contractTax; @Schema(description = "经济事项 bip推送应收用") @Column(columnDefinition = "VARCHAR(32) comment '经济事项 bip推送应收用'") private String economicMatters; } platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -4,6 +4,7 @@ import com.by4cloud.platformx.business.entity.ContractSubjectMatter; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -46,7 +47,7 @@ private Integer contractType; @Schema(description = "供应属性 0-成品 1-备件 2-大修 3-其他") private Integer supplyAttribute; private String supplyAttribute; @Schema(description = "合同状态（0-草稿 1-已生效 2-已终止 3-已过期）") private Integer contractStatus; @@ -153,6 +154,9 @@ @Schema(description = "合同总价税率") private BigDecimal contractTax; @Schema(description = "经济事项 bip推送应收用") private String economicMatters; private List<ContractPaymentSchedule> contractPaymentSchedule; private List<ContractSubjectMatter> contractSubjectMatter; platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -242,6 +242,18 @@ } /** * 根据模版生成word通方公司工业品买卖合同 * @param id id * @return R */ @Operation(summary = "根据模版生成word合同" , description = "根据模版生成word合同" ) @GetMapping("/exportContractTFGSGYPMMWord/{id}" ) public void exportContractTFGSGYPMMWord(@PathVariable("id" ) Long id, HttpServletResponse response) { contractService.exportContractTFGSGYPMMWord(id,response); } /** * 延期出货审批 */
@@ -140,6 +140,15 @@ } /** * 账龄市场分析 * @return R */ @PostMapping("/agingAnalysisByMarket") public R agingAnalysisByMarket(@RequestBody AnalysisCommonDTO commonDTO) { return statisticService.agingAnalysisByMarket(commonDTO); } /** * 账龄分析 * @return R */ @@ -147,4 +156,13 @@ public R agingAnalysis(@RequestBody AnalysisCommonDTO commonDTO) { return statisticService.agingAnalysis(commonDTO); } /** * 规模统计 * @return R */ @PostMapping("/agingAnalysisTotalScale") public R agingAnalysisTotalScale(@RequestBody AnalysisCommonDTO commonDTO) { return statisticService.agingAnalysisTotalScale(commonDTO); } } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java
@@ -26,4 +26,6 @@ List<AgingVo> selectAgingTotalShip(@Param("queryDTO") AgingQueryDTO queryDTO); List<AgingVo> selectAgingTotalInvoice(@Param("queryDTO") AgingQueryDTO queryDTO); List<AgingVo> selectAgingTotalScale(@Param("queryDTO") AgingQueryDTO queryDTO); } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
@@ -51,4 +51,6 @@ R delayOutApproval(DelayOutApprovalDTO dto); Page pageScope(Page page, ContracQueryDTO queryDTO); void exportContractTFGSGYPMMWord(Long id, HttpServletResponse response); } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java
@@ -29,4 +29,8 @@ R agingAnalysisByIndustry(AnalysisCommonDTO commonDTO); R agingAnalysis(AnalysisCommonDTO commonDTO); R agingAnalysisByMarket(AnalysisCommonDTO commonDTO); R agingAnalysisTotalScale(AnalysisCommonDTO commonDTO); } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -1169,10 +1169,88 @@ return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id")); } public static void main(String[] args) { System.out.println(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05"))); System.out.println(DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30"))); System.out.println(DateUtil.betweenMonth(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")), DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")),true)); @Override public void exportContractTFGSGYPMMWord(Long id, HttpServletResponse response) { Contract contract = baseMapper.selectById(id); List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery() .eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime)); Map<String, Object> map = new HashMap<>(); //合同基本信息 map.put("partyA", contract.getPartyA()); map.put("partyB", contract.getPartyB()); map.put("contractNo", contract.getContractNo()); map.put("signPlace", contract.getSignPlace()); map.put("signDate", DateUtil.formatDate(contract.getSignDate())); map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN)); map.put("total", contract.getAmount()); map.put("amountWords", Convert.digitToChinese(contract.getAmount())); //标的物 List<Map<String, Object>> items = new ArrayList<>(); List<RowRenderData> dataList = new ArrayList<>(); AtomicReference<Integer> no = new AtomicReference<>(0); subjectMatterList.stream().forEach(contractSubjectMatter -> { Map<String, Object> item = new HashMap<>(); item.put("materialName", contractSubjectMatter.getMaterialName()); item.put("guige", contractSubjectMatter.getSpecification()); item.put("unit", contractSubjectMatter.getUnit()); item.put("quantity", contractSubjectMatter.getQuantity()); item.put("unitPrice", contractSubjectMatter.getUnitPrice()); item.put("price", contractSubjectMatter.getTotalAmount()); items.add(item); no.updateAndGet(v -> v + 1); }); map.put("items", items); //定制方 BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId()); map.put("companyName", customer.getRegisterName()); map.put("legalPerson", customer.getLegalPerson()); map.put("contactPhone", customer.getContactPhone()); map.put("bankName", customer.getBankName()); map.put("bankAccount", customer.getBankAccount()); //承揽方 R<SysDept> r = remoteDeptService.getById(contract.getPartyBId()); SysDept dept = r.getData(); map.put("orgName", dept.getOrgName()); map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : ""); map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent()); map.put("orgContact", dept.getOrgContact()); map.put("orgBank", dept.getOrgBank()); map.put("orgBankAccount", dept.getOrgBankAccount()); //生成文件名 Long time = new Date().getTime(); // 生成的word格式 String formatSuffix = ".docx"; // 拼接后的文件名 String fileName = time + formatSuffix;//文件名 带后缀 //导出word try { // 1. 加载模版 // 假设模版在 resources/templates/template.docx ClassPathResource resource = new ClassPathResource("template/tfgs/tfgsgypmmht.docx"); // 配置列表策略 Configure config = Configure.builder() .bind("items", new LoopRowTableRenderPolicy()) // 将 items 绑定到行循环策略 .build(); // 2. 编译并渲染数据 XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map); // 3. 设置响应头 response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); response.setCharacterEncoding("utf-8"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx"); // 4. 写入输出流 OutputStream out = response.getOutputStream(); xwpfTemplate.write(out); out.flush(); out.close(); xwpfTemplate.close(); // 重要：关闭模版释放资源 } catch (IOException e) { e.printStackTrace(); } } } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
@@ -2,6 +2,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.by4cloud.platformx.admin.api.entity.SysDept; import com.by4cloud.platformx.admin.api.entity.SysDictItem; import com.by4cloud.platformx.admin.api.feign.RemoteDeptService; import com.by4cloud.platformx.admin.api.feign.RemoteDictService; @@ -450,7 +451,7 @@ R<List<SysDictItem>> r = remoteDictService.getDictByType("industry_sector"); List<SysDictItem> items = r.getData(); if (ArrayUtil.isEmpty(items.toArray())){ return R.failed("地区字典分类获取异常"); return R.failed("行业字典分类获取异常"); } List<AgingAnalysisVo> result = new ArrayList<>(); AgingQueryDTO queryDTO = new AgingQueryDTO(); @@ -699,4 +700,194 @@ } return companyAgingVo; } @Override public R agingAnalysisByMarket(AnalysisCommonDTO commonDTO) { R<List<SysDictItem>> r = remoteDictService.getDictByType("market_type"); List<SysDictItem> items = r.getData(); if (ArrayUtil.isEmpty(items.toArray())){ return R.failed("市场类型字典分类获取异常"); } List<AgingAnalysisVo> result = new ArrayList<>(); AgingQueryDTO queryDTO = new AgingQueryDTO(); List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotal(null); items.stream().forEach(item->{ AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName(item.getLabel()); queryDTO.setClassId(item.getItemValue()); List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO); //补全数据 if (ArrayUtil.isEmpty(companyAgingVo.toArray())){ companyAgingVo = new ArrayList<>(); AgingVo agingVo1 = new AgingVo("0-30天",new BigDecimal("0"),null); AgingVo agingVo2 = new AgingVo("31-60天",new BigDecimal("0"),null); AgingVo agingVo3 = new AgingVo("61-90天",new BigDecimal("0"),null); AgingVo agingVo4 = new AgingVo("91-180天",new BigDecimal("0"),null); AgingVo agingVo5 = new AgingVo("181-365天",new BigDecimal("0"),null); AgingVo agingVo6 = new AgingVo("1年以上",new BigDecimal("0"),null); companyAgingVo.add(agingVo1); companyAgingVo.add(agingVo2); companyAgingVo.add(agingVo3); companyAgingVo.add(agingVo4); companyAgingVo.add(agingVo5); companyAgingVo.add(agingVo6); }else { List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList()); if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30天")){ AgingVo agingVo1 = new AgingVo("0-30天",new BigDecimal("0"),null); companyAgingVo.add(agingVo1); } if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60天")){ AgingVo agingVo2 = new AgingVo("31-60天",new BigDecimal("0"),null); companyAgingVo.add(agingVo2); } if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90天")){ AgingVo agingVo3 = new AgingVo("61-90天",new BigDecimal("0"),null); companyAgingVo.add(agingVo3); } if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180天")){ AgingVo agingVo4 = new AgingVo("91-180天",new BigDecimal("0"),null); companyAgingVo.add(agingVo4); } if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365天")){ AgingVo agingVo5 = new AgingVo("181-365天",new BigDecimal("0"),null); companyAgingVo.add(agingVo5); } if (!ArrayUtil.contains(overdueRanges.toArray(),"1年以上")){ AgingVo agingVo6 = new AgingVo("1年以上",new BigDecimal("0"),null); companyAgingVo.add(agingVo6); } } agingAnalysisVo.setAmount(companyAgingVo.stream().map(AgingVo::getTotalAmount).collect(Collectors.toList())); List<AgingVo> finalCompanyAgingVo = companyAgingVo; agingAnalysisVo.setPercent(IntStream.range(0, agingVoList.size()) .mapToObj(i -> { BigDecimal part = finalCompanyAgingVo.get(i).getTotalAmount(); BigDecimal total = agingVoList.get(i).getTotalAmount(); if (total == null || total.compareTo(BigDecimal.ZERO) == 0) { return null; } return part.divide(total, 4, RoundingMode.HALF_UP) .multiply(new BigDecimal("100")) .setScale(2, RoundingMode.HALF_UP); }) .collect(Collectors.toList())); result.add(agingAnalysisVo); }); //合计 AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName("合计"); agingAnalysisVo.setAmount(agingVoList.stream().map(AgingVo::getTotalAmount).collect(Collectors.toList())); List<BigDecimal> percent = IntStream.range(0, agingAnalysisVo.getAmount().size()) .mapToObj(i -> { if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) { return null; }else { return new BigDecimal("100"); } }) .collect(Collectors.toList()); agingAnalysisVo.setPercent(percent); result.add(agingAnalysisVo); return R.ok(result); } @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(tfgs)); compIds.add(Long.valueOf(ymj)); compIds.add(Long.valueOf(jxc)); List<AgingAnalysisVo> result = new ArrayList<>(); AgingQueryDTO queryDTO = new AgingQueryDTO(); List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalScale(null); compIds.stream().forEach(compId->{ R<SysDept> r = remoteDeptService.getById(compId); if (!r.isOk()){ return; } SysDept dept = r.getData(); AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName(dept.getOrgName()); queryDTO.setCompanyId(dept.getDeptId()); List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalScale(queryDTO); //补全数据 if (ArrayUtil.isEmpty(companyAgingVo.toArray())){ companyAgingVo = new ArrayList<>(); AgingVo agingVo1 = new AgingVo("0-30天",new BigDecimal("0"),null); AgingVo agingVo2 = new AgingVo("31-60天",new BigDecimal("0"),null); AgingVo agingVo3 = new AgingVo("61-90天",new BigDecimal("0"),null); AgingVo agingVo4 = new AgingVo("91-180天",new BigDecimal("0"),null); AgingVo agingVo5 = new AgingVo("181-365天",new BigDecimal("0"),null); AgingVo agingVo6 = new AgingVo("1年以上",new BigDecimal("0"),null); companyAgingVo.add(agingVo1); companyAgingVo.add(agingVo2); companyAgingVo.add(agingVo3); companyAgingVo.add(agingVo4); companyAgingVo.add(agingVo5); companyAgingVo.add(agingVo6); }else { List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList()); if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30天")){ AgingVo agingVo1 = new AgingVo("0-30天",new BigDecimal("0"),null); companyAgingVo.add(agingVo1); } if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60天")){ AgingVo agingVo2 = new AgingVo("31-60天",new BigDecimal("0"),null); companyAgingVo.add(agingVo2); } if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90天")){ AgingVo agingVo3 = new AgingVo("61-90天",new BigDecimal("0"),null); companyAgingVo.add(agingVo3); } if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180天")){ AgingVo agingVo4 = new AgingVo("91-180天",new BigDecimal("0"),null); companyAgingVo.add(agingVo4); } if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365天")){ AgingVo agingVo5 = new AgingVo("181-365天",new BigDecimal("0"),null); companyAgingVo.add(agingVo5); } if (!ArrayUtil.contains(overdueRanges.toArray(),"1年以上")){ AgingVo agingVo6 = new AgingVo("1年以上",new BigDecimal("0"),null); companyAgingVo.add(agingVo6); } } agingAnalysisVo.setAmount(companyAgingVo.stream().map(AgingVo::getTotalAmount).collect(Collectors.toList())); List<AgingVo> finalCompanyAgingVo = companyAgingVo; agingAnalysisVo.setPercent(IntStream.range(0, agingVoList.size()) .mapToObj(i -> { BigDecimal part = finalCompanyAgingVo.get(i).getTotalAmount(); BigDecimal total = agingVoList.get(i).getTotalAmount(); if (total == null || total.compareTo(BigDecimal.ZERO) == 0) { return null; } return part.divide(total, 4, RoundingMode.HALF_UP) .multiply(new BigDecimal("100")) .setScale(2, RoundingMode.HALF_UP); }) .collect(Collectors.toList())); result.add(agingAnalysisVo); }); //合计 AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo(); agingAnalysisVo.setCompanyName("合计"); agingAnalysisVo.setAmount(agingVoList.stream().map(AgingVo::getTotalAmount).collect(Collectors.toList())); List<BigDecimal> percent = IntStream.range(0, agingAnalysisVo.getAmount().size()) .mapToObj(i -> { if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) { return null; }else { return new BigDecimal("100"); } }) .collect(Collectors.toList()); agingAnalysisVo.setPercent(percent); result.add(agingAnalysisVo); return R.ok(result); } } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java
@@ -38,7 +38,8 @@ MPJLambdaWrapper<TaxCode> wrapper = new MPJLambdaWrapper<TaxCode>() .selectAll(TaxCode.class) .selectAs("(select count(1) from tax_code t1 where t1.parent_bm = t.bm)",TaxCode::getChildNum) .like(StrUtil.isNotBlank(queryDTO.getMc()),TaxCode::getMc,queryDTO.getMc()); .like(StrUtil.isNotBlank(queryDTO.getMc()),TaxCode::getMc,queryDTO.getMc()) .like(StrUtil.isNotBlank(queryDTO.getBm()),TaxCode::getBm,queryDTO.getBm()); if (ObjUtil.isNotNull(queryDTO.getChildNum())){ if (queryDTO.getChildNum()==0){ wrapper.eq("(select count(1) from tax_code t1 where t1.parent_bm = t.bm)",0); platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml
@@ -89,6 +89,9 @@ <if test="queryDTO.industryId !=null"> and bc.industry_id = #{queryDTO.industryId} </if> <if test="queryDTO.classId !=null"> and bc.class_id = #{queryDTO.classId} </if> GROUP BY ranges.overdue_range, ranges.min_days @@ -227,4 +230,63 @@ ORDER BY ranges.min_days; </select> <select id="selectAgingTotalScale" resultType="com.by4cloud.platformx.business.vo.AgingVo"> SELECT ranges.overdue_range, COALESCE ( SUM( CASE WHEN cps.payment_status = '0' THEN cps.planned_amount WHEN cps.payment_status = '1' THEN cps.planned_amount - cps.actual_amount ELSE 0 END ), 0 ) AS total_amount FROM ( SELECT '0-30天' AS overdue_range, 0 AS min_days, 30 AS max_days UNION ALL SELECT '31-60天', 31, 60 UNION ALL SELECT '61-90天', 61, 90 UNION ALL SELECT '91-180天', 91, 180 UNION ALL SELECT '181-365天', 181, 365 UNION ALL SELECT '1年以上', 366, 999999 ) AS ranges LEFT JOIN contract_payment_schedule cps ON cps.del_flag = '0' AND cps.payment_status NOT IN ( '2', '3' ) AND cps.effective_end_date < CURRENT_DATE AND DATEDIFF( CURRENT_DATE, cps.effective_end_date ) BETWEEN ranges.min_days AND ranges.max_days LEFT JOIN contract c ON cps.contract_id = c.id WHERE c.del_flag = '0' <if test="queryDTO.companyId !=null"> and c.party_b_id = #{queryDTO.companyId} </if> GROUP BY ranges.overdue_range, ranges.min_days ORDER BY ranges.min_days; </select> </mapper> platformx-business-finance-biz/src/main/resources/template/tfgs/tfgsgypmmht.docxBinary files differ
platformx-business-finance-biz/src/main/resources/template/ymj/ymjgypmmht.docxBinary files differ
