Merge remote-tracking branch 'origin/master' into master

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -715,7 +715,7 @@ public class MeterTreeController extends BladeController {
             MeterContractInfo contract = meterContractInfoService.getOne(
                     new LambdaQueryWrapper<MeterContractInfo>().eq(MeterContractInfo::getContractId,vo.getContractId()));
             if (contract == null){
-                return R.fail("未获取到合同段信息");
+                return R.fail("合同段未保存过计量配置信息，请联系管理员保存");
             }
             vo.setSevenRatio(contract.getSevenRatio());
             vo.setTwentyEightRatio(contract.getTwentyEightRatio());

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2615,6 +2615,7 @@ public class TaskController extends BladeController {
                         }
                         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()));
@@ -3607,9 +3608,10 @@ public class TaskController extends BladeController {
             //如果没有节点或者清单，直接判断不需要
             return null;
         }
+        //不可填的字段
         Set<String> strings = new HashSet<>();
         strings.add("项目名称：");
-        strings.add("申请书收到时间：");
+//        strings.add("申请书收到时间：");
         strings.add("意见发出日期：");
         strings.add("申请进度款摘录_摘录人_时间");
         strings.add("造价机构现场咨询意见_截止上期已累计审批进度款（元）");