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

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

@@ -1507,7 +1507,7 @@ public class TaskController extends BladeController {
         int size = dto.getSize() <= 0 ? 10 : dto.getSize();
         List<Object> params = new ArrayList<>();
         StringBuilder sqlBuilder = new StringBuilder()
-                .append("SELECT id, task_name, type, meter_task_type, status, start_time, end_time, ")
+                .append("SELECT id, task_name, type, meter_task_type, status, start_time, end_time, project_id,")
                 .append("task_content, report_user, fixed_flow_id, process_instance_id, ")
                 .append("meter_task_repeal_desc, form_data_id ")
                 .append("FROM u_task ")

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/InterimPayCertificateItemServiceImpl.java

@@ -142,8 +142,8 @@ public class InterimPayCertificateItemServiceImpl extends BaseServiceImpl<Interi
                 InterimPayCertificateItem item = new InterimPayCertificateItem();
                 item.setCertificateId(reportId);
                 item.setSort(100);
-                item.setFormName(vo.getChapterSeq());
-                item.setChapterSeq(vo.getFormName());
+                item.setNoApply(1);
+                item.setChapterSeq(vo.getChapterSeq());
                 item.setContractAmount(vo.getCurrentMeterMoney() == null ? null : vo.getCurrentMeterMoney().toString());
                 item.setRevisedTotal(vo.getChangeMeterMoney() == null ? null : vo.getChangeMeterMoney().toString());
                 item.setRevisedAmount(vo.getAfterCurrentMeterMoney() == null ? null : vo.getAfterCurrentMeterMoney().toString());