计量-材料和开工报表，返回taskId

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.meter.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.meter.entity.MaterialStartStatement;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,4 +32,7 @@ import lombok.EqualsAndHashCode;
 public class MaterialStartStatementVO extends MaterialStartStatement {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "任务id")
+	private Long taskId;
+
 }

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

@@ -25,6 +25,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.meter.vo.MaterialStartStatementVO;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -71,8 +72,8 @@ public class MaterialStartStatementController extends BladeController {
 			@ApiImplicitParam(name = "current", value = "当前页", required = true),
 			@ApiImplicitParam(name = "size", value = "每页数量", required = true)
 	})
-	public R<IPage<MaterialStartStatement>> page(MaterialStartStatement statement, Query query) {
-		IPage<MaterialStartStatement> pages = materialStartStatementService.page2(statement,query);
+	public R<IPage<MaterialStartStatementVO>> page(MaterialStartStatement statement, Query query) {
+		IPage<MaterialStartStatementVO> pages = materialStartStatementService.page2(statement,query);
 		return R.data(pages);
 	}
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MaterialStartStatementMapper.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.meter.entity.MaterialStartStatement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.meter.vo.MaterialStartStatementVO;
 
 /**
  * 材料和开工报表 Mapper 接口
@@ -30,5 +31,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface MaterialStartStatementMapper extends BaseMapper<MaterialStartStatement> {
 
 
-    IPage<MaterialStartStatement> page2(IPage<MaterialStartStatement> page,@Param("statement") MaterialStartStatement statement);
+    IPage<MaterialStartStatementVO> page2(IPage<MaterialStartStatementVO> page, @Param("statement") MaterialStartStatement statement);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MaterialStartStatementMapper.xml

@@ -24,8 +24,9 @@
         <result column="sort" property="sort"/>
         <result column="raw_url" property="rawUrl"/>
     </resultMap>
-    <select id="page2" resultType="org.springblade.meter.entity.MaterialStartStatement">
-        select *
+    <select id="page2" resultType="org.springblade.meter.vo.MaterialStartStatementVO">
+        select *,
+               (select id from u_task where form_data_id = mss.meter_period_id and is_deleted = 0 and status in (1,2)) as taskId
         from s_material_start_statement mss
         where contract_id = #{statement.contractId} and type = #{statement.type} and is_deleted = 0
         order by create_time desc

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IMaterialStartStatementService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.meter.entity.MaterialStartStatement;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.meter.vo.MaterialStartStatementVO;
 
 import java.util.List;
 
@@ -32,7 +33,7 @@ import java.util.List;
 public interface IMaterialStartStatementService extends BaseService<MaterialStartStatement> {
 
 
-    IPage<MaterialStartStatement> page2(MaterialStartStatement statement, Query query);
+    IPage<MaterialStartStatementVO> page2(MaterialStartStatement statement, Query query);
 
     void addOrUpdate(MaterialStartStatement materialStartStatement);
 

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

@@ -27,6 +27,7 @@ import org.springblade.meter.mapper.MaterialStartStatementMapper;
 import org.springblade.meter.service.IMaterialStartStatementService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.meter.service.IMeterPeriodService;
+import org.springblade.meter.vo.MaterialStartStatementVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -46,8 +47,8 @@ public class MaterialStartStatementServiceImpl extends BaseServiceImpl<MaterialS
      * 分页 材料和开工报表
      */
     @Override
-    public IPage<MaterialStartStatement> page2(MaterialStartStatement statement, Query query) {
-        IPage<MaterialStartStatement> page = new Page<>(query.getCurrent(),query.getSize());
+    public IPage<MaterialStartStatementVO> page2(MaterialStartStatement statement, Query query) {
+        IPage<MaterialStartStatementVO> page = new Page<>(query.getCurrent(),query.getSize());
         return baseMapper.page2(page,statement);
     }