From 9a0b88c9779e41a5346cc2941d0cbffcfdce432a Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Mon, 14 Oct 2024 17:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=A1=B5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/doc/util/itext7/PageEventHandler.java | 2 +- .../pusong/business/domain/vo/PsContractInfoVo.java | 13 ++++++------- .../mapper/business/PsContractInfoMapper.xml | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/itext7/PageEventHandler.java b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/itext7/PageEventHandler.java index d0565be..9f1e43f 100644 --- a/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/itext7/PageEventHandler.java +++ b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/itext7/PageEventHandler.java @@ -82,7 +82,7 @@ public class PageEventHandler implements IEventHandler { ImageData image = ImageDataFactory.create(psth); PdfCanvas pdfCanvas = canvas.getPdfCanvas(); float width = 75 * 0.72f; - pdfCanvas.addImage(image,right - width,400, width, false); + pdfCanvas.addImage(image,right - width,500, width, false); } catch (MalformedURLException e) { throw new RuntimeException(e); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java index 9baf066..8c1b3e6 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java @@ -1,21 +1,16 @@ package com.pusong.business.domain.vo; -import java.math.BigDecimal; -import java.util.Date; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.fasterxml.jackson.annotation.JsonFormat; import com.pusong.business.domain.PsContractInfo; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.pusong.common.excel.annotation.ExcelDictFormat; -import com.pusong.common.excel.convert.ExcelDictConvert; import com.pusong.common.translation.annotation.Translation; import com.pusong.common.translation.constant.TransConstant; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -267,6 +262,10 @@ public class PsContractInfoVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Long createBy; + /** + * 任务未完成为 true + */ + private boolean taskNoFinish; /** * 服务项目里是否为 托管服务 diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml index 40a7a9a..4d9a1bc 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml @@ -30,7 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cus.custom_status cus_custom_status, us.nick_name custom_manager_name, (select ptm.invoice from ps_task_main ptm where ptm.task_type = '3' and ptm.contract_code = info.contract_code and ptm.task_status = 30 limit 0,1) - as invoice_ossid + as invoice_ossid, + (select 1 from ps_task_main where contract_code = info.contract_code and task_status != '30' limit 1) task_no_finish from ps_contract_info info left join ps_company_info com on info.company_id = com.id left join ps_custom_info cus on info.custom_id = cus.id