计量-中期支付证书，返回taskId

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

@@ -38,4 +38,7 @@ public class InterimPayCertificateVO extends InterimPayCertificate {
 	@ApiModelProperty(value = "支付项集合")
 	List<InterimPayCertificateItem> payList;
 
+	@ApiModelProperty(value = "任务id")
+	private Long taskId;
+
 }

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

@@ -115,8 +115,9 @@ public class InterimPayCertificateController extends BladeController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "contractId", value = "合同id", required = true)
 	})
-	public R<IPage<InterimPayCertificate>> page(InterimPayCertificate interimPayCertificate, Query query) {
-		IPage<InterimPayCertificate> pages = interimPayCertificateService.page(Condition.getPage(query), Condition.getQueryWrapper(interimPayCertificate).orderByDesc("create_time"));
+	public R<IPage<InterimPayCertificateVO>> page(InterimPayCertificate interimPayCertificate, Query query) {
+//		IPage<InterimPayCertificate> pages = interimPayCertificateService.page(Condition.getPage(query), Condition.getQueryWrapper(interimPayCertificate).orderByDesc("create_time"));
+		IPage<InterimPayCertificateVO> pages = interimPayCertificateService.page2(interimPayCertificate,query);
 		return R.data(pages);
 	}
 

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.meter.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.meter.entity.InterimPayCertificate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,4 +32,6 @@ public interface InterimPayCertificateMapper extends BaseMapper<InterimPayCertif
 
 
     InterimPayCertificateVO getById(@Param("id") Long id);
+
+    IPage<InterimPayCertificateVO> page2(IPage<InterimPayCertificateVO> iPage,@Param("pay") InterimPayCertificate interimPayCertificate);
 }

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

@@ -30,6 +30,13 @@
         select * from s_interim_pay_certificate
         where id = #{id}
     </select>
+    <select id="page2" resultType="org.springblade.meter.vo.InterimPayCertificateVO">
+        select *,
+               (select id from u_task where form_data_id = sipc.contract_period_id and is_deleted = 0 and status in (1,2) limit 1) as taskId
+        from s_interim_pay_certificate sipc
+        where contract_id = #{pay.contractId} and is_deleted = 0
+        order by create_time desc
+    </select>
 
 
 </mapper>

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.meter.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.support.Query;
 import org.springblade.meter.entity.InterimPayCertificate;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.meter.vo.InterimPayCertificateVO;
@@ -47,4 +49,6 @@ public interface IInterimPayCertificateService extends BaseService<InterimPayCer
 
     /**存在中期支付证书，就不允许直接删*/
     List<Long> existCertificate(Long contractId);
+
+    IPage<InterimPayCertificateVO> page2(InterimPayCertificate interimPayCertificate, Query query);
 }

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

@@ -17,9 +17,12 @@
 package org.springblade.meter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Query;
 import org.springblade.meter.entity.InterimPayCertificate;
 import org.springblade.meter.entity.InterimPayCertificateItem;
 import org.springblade.meter.entity.MeterPeriod;
@@ -166,4 +169,11 @@ public class InterimPayCertificateServiceImpl extends BaseServiceImpl<InterimPay
         }
        return Collections.emptyList();
     }
+
+    @Override
+    public IPage<InterimPayCertificateVO> page2(InterimPayCertificate interimPayCertificate, Query query) {
+        IPage<InterimPayCertificateVO> iPage = new Page<>(query.getCurrent(),query.getSize());
+        iPage = baseMapper.page2(iPage,interimPayCertificate);
+        return iPage;
+    }
 }