|
|
@@ -1324,7 +1324,7 @@ public class TaskController extends BladeController {
|
|
|
if (dataInfo.size() == 0) {
|
|
|
tableData.put("key_18__3_1", projectClient.getById(task.getProjectId()).getProjectName() + contractClient.getContractById(Long.valueOf(task.getContractId())).getContractName());
|
|
|
tableData.put("key_7__4_3", reportAllMoney);
|
|
|
- tableData.put("key_1__5_3", LocalDate.now());
|
|
|
+ tableData.put("key_1__5_3", DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
tableData.put("key_5__10_1", reportAllMoney);
|
|
|
//获取本期之前所有计量期金额
|
|
|
BigDecimal beforeMoney = contractMeterPeriodMapper.getBeforeMoney(period);
|
|
|
@@ -1334,6 +1334,7 @@ public class TaskController extends BladeController {
|
|
|
tableData.put("key_10__11_3", beforeMoney == null ? reportAllMoney : beforeMoney.add(reportAllMoney));
|
|
|
} else {
|
|
|
tableData = dataInfo;
|
|
|
+ tableData.put("key_18__3_1", projectClient.getById(task.getProjectId()).getProjectName() + contractClient.getContractById(Long.valueOf(task.getContractId())).getContractName());
|
|
|
}
|
|
|
vo.setTableData(tableData);
|
|
|
} else {
|
|
|
@@ -2541,10 +2542,11 @@ public class TaskController extends BladeController {
|
|
|
if (flowIds.size() == 0) {
|
|
|
throw new ServiceException("未找到流程人信息");
|
|
|
}
|
|
|
+ tableData.put("key_18__3_1", projectClient.getById(task.getProjectId()).getProjectName() + contractClient.getContractById(Long.valueOf(task.getContractId())).getContractName());
|
|
|
//申请进度时间
|
|
|
- tableData.put("key_17__7_3", LocalDate.now());
|
|
|
+ tableData.put("key_17__7_3", DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
//电签单位日期
|
|
|
- tableData.put("key_4__13_4", LocalDate.now());
|
|
|
+ tableData.put("key_4__13_4", DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
String pdfUrl = "";
|
|
|
try {
|
|
|
pdfUrl = getEntrustPDFTrial(Long.valueOf(dto.getProjectId()), dto.getContractId(), aPrivate.getPKeyId(), tableData, flowIds);
|
qianxb