Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -187,6 +187,16 @@ public class ArchivesAutoVO extends ArchivesAuto {
 	@ApiModelProperty("附件信息")
 	private List<ApprovalFile> approvalFileList = new ArrayList<>();
 
+	/**
+	 * 开始时间 转换成这种格式 20251201
+	 */
+	private String startDateValue;
+
+	/**
+	 * 结束时间 转换成这种格式 20251201
+	 */
+	private String endDateValue;
+
 	public void setApprovalFileList(List<ApprovalFile> approvalFileList) {
 		this.approvalFileList = approvalFileList;
 	}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -689,6 +689,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		List<DictBiz> sheetSourceList = this.iDictBizClient.getList("security_level", "notRoot").getData();
 		List<DictBiz> sheetSourceList1 = this.iDictBizClient.getList("storage_period", "notRoot").getData();
 
+		// 定义目标格式的 DateTimeFormatter
+		DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
 		pageVoList.forEach(vos -> {
 			if (StringUtils.isNotEmpty(vos.getSecretLevel())) {
 				sheetSourceList.forEach(source -> {
@@ -704,6 +706,19 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					}
 				});
 			}
+			if (vos.getStartDate() != null) {
+				// 使用 formatter 将 LocalDateTime 转换为 String
+				vos.setStartDateValue(vos.getStartDate().format(outputFormatter));
+			} else {
+				vos.setStartDateValue(""); // 或者设置为 null，取决于前端需求
+			}
+
+			if (vos.getEndDate() != null) {
+				// 使用 formatter 将 LocalDateTime 转换为 String
+				vos.setEndDateValue(vos.getEndDate().format(outputFormatter));
+			} else {
+				vos.setEndDateValue(""); // 或者设置为 null，取决于前端需求
+			}
 		});
 
 		//删除不存在文件的档案

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -2274,7 +2274,8 @@ public class ExecutorMeter extends FormulaExecutor {
                 BigDecimal[] sum = contractMoney.get(k);
                 cs.setChapterNumber(k);
                 cs.setContractMoney(sum[0].toPlainString());
-                cs.setChangeMoney(sum[1].toPlainString());
+                /*合同金额 2-8公式开发之前逻辑*/
+                //cs.setChangeMoney(sum[1].toPlainString());
                 cs.setCurrentPeriodPay(StringUtils.handleNumNull(currentMoney.get(k)));
                 cs.setCurrentPeriodEndPay(StringUtils.handleNull(endMoney.get(k)));
                 cs.setItemPercent(ratioFc.apply(cs.getChangeMoney(), baseInfo.getContractAmount().toString()));
@@ -2293,8 +2294,8 @@ public class ExecutorMeter extends FormulaExecutor {
                         .map(BaseUtils::str2BigDecimal)
                         .reduce(BigDecimal.ZERO, BigDecimal::add)
                         .setScale(0, RoundingMode.HALF_UP);  // 四舍五入保留整数
-                //String changeMoneyAllWan = changeMoneyAll.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP).toPlainString();
                 cs.setChangeMoneyAll(changeMoneyAll+"");
+                cs.setChangeMoney(BaseUtils.str2BigDecimal(cs.getContractMoney()).add(changeMoneyAll).toPlainString());
                 dataList.add(cs);
             });
             /*每月合计进度*/