mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同页任务是否完成

Browse Source
This commit is contained in:
mx 2024-10-14 17:51:48 +08:00
parent 9f53101a20
commit 9a0b88c977
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/itext7/PageEventHandler.java
View File

@ -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);
}

13
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java
View File

@ -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;
/**
* 服务项目里是否为 托管服务

3
pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml
View File

@ -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