|
@@ -1428,7 +1428,7 @@ public class TaskController extends BladeController {
|
|
|
if (dataInfo.size() == 0) {
|
|
|
tableData.put(map.get("项目名称:"), projectClient.getById(task.getProjectId()).getProjectName() + contractClient.getContractById(Long.valueOf(task.getContractId())).getContractName());
|
|
|
tableData.put(map.get("要求付款额度"), reportAllMoney);
|
|
|
- tableData.put(map.get("意见发出日期:"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
+// tableData.put(map.get("意见发出日期:"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
tableData.put(map.get("造价机构现场咨询意见_本期审核进度款(元)"), reportAllMoney);
|
|
|
BigDecimal beforeMoney = null;
|
|
|
//获取本期之前所有计量期金额
|
|
@@ -2751,10 +2751,12 @@ public class TaskController extends BladeController {
|
|
|
if (flowIds.size() == 0) {
|
|
|
throw new ServiceException("未找到流程人信息");
|
|
|
}
|
|
|
+ if (tableData.get((map.get("意见发出日期:"))) == null)
|
|
|
+ tableData.put(map.get("意见发出日期:"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
tableData.put(map.get("项目名称:"), projectClient.getById(task.getProjectId()).getProjectName() + contractClient.getContractById(Long.valueOf(task.getContractId())).getContractName());
|
|
|
//申请书收到时间
|
|
|
if (tableData.get((map.get("申请书收到时间:"))) == null)
|
|
|
- tableData.put(map.get("申请书收到时间:"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
+ tableData.put(map.get("申请书收到时间:"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
//申请进度时间
|
|
|
// tableData.put(map.get("申请进度款摘录_摘录人_时间"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
|
|
|
//电签单位日期
|
|
@@ -3757,7 +3759,7 @@ public class TaskController extends BladeController {
|
|
|
Set<String> strings = new HashSet<>();
|
|
|
strings.add("项目名称:");
|
|
|
// strings.add("申请书收到时间:");
|
|
|
- strings.add("意见发出日期:");
|
|
|
+// strings.add("意见发出日期:");
|
|
|
// strings.add("申请进度款摘录_摘录人_时间");
|
|
|
strings.add("造价机构现场咨询意见_截止上期已累计审批进度款(元)");
|
|
|
strings.add("造价机构现场咨询意见_截止上期已累计审批进度款(元)_截止本期已累计审核进度款(元)");
|