对接任务流程查看

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/ApiTaskPageVo.java

@@ -33,4 +33,13 @@ public class ApiTaskPageVo {
     @ApiModelProperty(value = "意见信息")
     private MeterApproveOpinion meterApproveOpinion;
 
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "限时时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "上报人")
+    private String taskReportUserName;
+
 }

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

@@ -26,6 +26,7 @@ import org.springblade.meter.mapper.MeterApproveOpinionMapper;
 import org.springblade.meter.mapper.MiddleMeterApplyTaskMapper;
 import org.springblade.meter.mapper.StartPayMeterFormTaskMapper;
 import org.springblade.meter.vo.ApiTaskPageVo;
+import org.springblade.system.user.entity.User;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.SingleColumnRowMapper;
@@ -123,6 +124,8 @@ public class APIController {
         String sqlPage = sqlString.toString();
         List<Task> resultList = jdbcTemplate.query(sqlPage, new BeanPropertyRowMapper<>(Task.class), params.toArray());
 
+        /*获取用户信息Map*/
+        Map<Long, String> nameMap = jdbcTemplate.query("select id,name from blade_user where is_deleted = 0", new BeanPropertyRowMapper<>(User.class)).stream().collect(Collectors.toMap(User::getId, User::getName, (key1, key2) -> key1));
         /*解析page分页数据*/
         IPage<ApiTaskPageVo> page = new Page<>(current, size);
         List<ApiTaskPageVo> pageList = resultList.stream().map(task -> {
@@ -130,6 +133,9 @@ public class APIController {
             vo.setTaskId(task.getId());
             vo.setTaskName(task.getTaskName());
             vo.setTaskStatusName(task.getStatus().equals(1) ? "待审批" : task.getStatus().equals(2) ? "已审批" : "已废除");
+            vo.setStartTime(task.getStartTime());
+            vo.setEndTime(task.getEndTime());
+            vo.setTaskReportUserName(nameMap.get(Long.parseLong(task.getReportUser())));
             String sql="";
             if(task.getMeterTaskType()!=null&&task.getMeterTaskType()==1){
                 sql="Select raw_url From s_interim_pay_certificate where contract_period_id="+task.getFormDataId()+" and is_deleted=0";