From 838618d0d4a7dd3b585a3a7390fa389e555c9bb0 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 22 六月 2026 15:44:40 +0800
Subject: [PATCH] feat:新增通方公司工业品买卖合同新增
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java | 193 +++++++++++++++++++++++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 8
platformx-business-finance-biz/src/main/resources/template/ymj/ymjgypmmht.docx | 0
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java | 2
platformx-business-finance-biz/src/main/resources/template/tfgs/tfgsgypmmht.docx | 0
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java | 18 ++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 12 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java | 6
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 88 +++++++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/AgingQueryDTO.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java | 3
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java | 4
platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml | 62 ++++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 6
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java | 3
17 files changed, 401 insertions(+), 10 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/AgingQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/AgingQueryDTO.java
index 4a6d89e..1eb9329 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/AgingQueryDTO.java
+++ b/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/寮�绁ㄦ椂闂�
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
index 43515c8..211d719 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
+++ b/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;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java
index bd5b44a..550c714 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java
+++ b/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;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
index ac52b6f..6288c78 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
+++ b/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;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index c4de463..2e040df 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/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;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index ceb4980..cdb8461 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/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;
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index f3447f0..5891368 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/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);
+ }
+
+
+ /**
* 寤舵湡鍑鸿揣瀹℃壒
*/
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java
index 1086131..52aff9c 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java
@@ -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);
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java
index c7b9965..27bd43f 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java
+++ b/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);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
index c879e9a..11ca86b 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
+++ b/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);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java
index 47222e2..11ca185 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java
+++ b/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);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index a9cf047..7a97217 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/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();
+ // 鐢熸垚鐨剋ord鏍煎紡
+ 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();
+ }
}
+
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
index de700ce..f6e8736 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
+++ b/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);
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java
index 1318846..6cff924 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java
+++ b/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);
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml
index 94fd082..c3364b2 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/template/tfgs/tfgsgypmmht.docx b/platformx-business-finance-biz/src/main/resources/template/tfgs/tfgsgypmmht.docx
new file mode 100644
index 0000000..8dd13df
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/template/tfgs/tfgsgypmmht.docx
Binary files differ
diff --git a/platformx-business-finance-biz/src/main/resources/template/ymj/ymjgypmmht.docx b/platformx-business-finance-biz/src/main/resources/template/ymj/ymjgypmmht.docx
index 1ec1a6b..4e8c502 100644
--- a/platformx-business-finance-biz/src/main/resources/template/ymj/ymjgypmmht.docx
+++ b/platformx-business-finance-biz/src/main/resources/template/ymj/ymjgypmmht.docx
Binary files differ
--
Gitblit v1.9.1