From d1be69104899d05e13b8f7af1c56e3554e8301fb Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:16:39 +0800 Subject: [PATCH] =?UTF-8?q?2025.0210=20=E6=96=87=E6=A1=A3=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/data/ProofDocumentData.java | 3 ++ .../pms/data/ProofingInformationData.java | 3 ++ .../service/Impl/EamProjectServiceImpl.java | 7 +++ .../Impl/ProofingInformationServiceImpl.java | 15 ++++++ .../mapper/pms/AgencyMatterMapper.xml | 4 +- .../mapper/pms/ProofingInformationMapper.xml | 53 ++++++++++++++++--- 6 files changed, 77 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java index 110bddc0..28482e95 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java @@ -90,6 +90,9 @@ public class ProofDocumentData extends ProofingInformationData { @TableField(exist = false) private Integer emailInfoType; + @TableField(exist = false) + private String overdueFlag; + public Integer getUserId() { return userId; } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java index d1c770ed..f93e16e7 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java @@ -99,6 +99,9 @@ public class ProofingInformationData extends EamProjectPartInfoData { private Date createDate; private String projectPhase; + @TableField(exist = false) + private String overdueFlag; + public String getProjectDesc() { return projectDesc; } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java index 28d42819..7ef22ec4 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java @@ -1028,6 +1028,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("样品单号"); s.append("预计完成日期"); s.append("待上传文档"); + s.append("文档状态"); s.append(""); // 遍历 emailAddress Integer lastProjectId = null; @@ -1073,6 +1074,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); s.append("").append(projectPartLink).append(""); + s.append("").append(proofingInformationData.getOverdueFlag()).append(""); s.append(""); } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) { // 判断如果与上一个ProofingNo不同 lastProofingNo = proofingInformationData.getProofingNo(); @@ -1099,6 +1101,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); s.append("").append(projectPartLink).append(""); + s.append("").append(proofingInformationData.getOverdueFlag()).append(""); s.append(""); } else { s.append(""); @@ -1123,6 +1126,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); s.append("").append(projectPartLink).append(""); + s.append("").append(proofingInformationData.getOverdueFlag()).append(""); s.append(""); } } else { @@ -1151,6 +1155,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); s.append("").append(projectPartLink).append(""); + s.append("").append(proofingInformationData.getOverdueFlag()).append(""); s.append(""); } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) { // 判断这条数据的打样单号与上一条数据的打样单号是否相同 lastProofingNo = proofingInformationData.getProofingNo(); @@ -1238,6 +1243,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(proofingInformationData.getProofingNo()).append(""); s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); s.append("").append(projectPartLink).append(""); + s.append("").append(proofingInformationData.getOverdueFlag()).append(""); s.append(""); } else { s.append(""); @@ -1284,6 +1290,7 @@ public class EamProjectServiceImpl implements EamProjectService { } } s.append("").append(projectPartLink).append(""); + s.append("").append(proofingInformationData.getOverdueFlag()).append(""); s.append(""); } } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java index 80b29942..e93564f9 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java @@ -333,18 +333,33 @@ public class ProofingInformationServiceImpl implements ProofingInformationServic @Override public PageUtils getPendingUploads(String userId,ProofDocumentData data) { + if (data.getUploadedFlag().equals("Y")){ + data.setUploadedFlag("已上传"); + } else if (data.getUploadedFlag().equals("N")){ + data.setUploadedFlag("未上传"); + } IPage pendingUploads = proofingInformationMapper.getPendingUploads(new Page<>(data.getPage(), data.getLimit()),userId,data); return new PageUtils(pendingUploads); } @Override public PageUtils getOverdueUploads(String userId,ProofDocumentData data) { + if (data.getUploadedFlag().equals("Y")){ + data.setUploadedFlag("已上传"); + } else if (data.getUploadedFlag().equals("N")){ + data.setUploadedFlag("未上传"); + } IPage overdueUploads = proofingInformationMapper.getOverdueUploads(new Page<>(data.getPage(), data.getLimit()),userId,data); return new PageUtils(overdueUploads); } @Override public PageUtils getAllUploads(String userId, ProofDocumentData data) { + if (data.getUploadedFlag().equals("Y")){ + data.setUploadedFlag("已上传"); + } else if (data.getUploadedFlag().equals("N")){ + data.setUploadedFlag("未上传"); + } IPage allUploads = proofingInformationMapper.getAllUploads(new Page<>(data.getPage(), data.getLimit()), userId,data); return new PageUtils(allUploads); } diff --git a/src/main/resources/mapper/pms/AgencyMatterMapper.xml b/src/main/resources/mapper/pms/AgencyMatterMapper.xml index 8661563e..7da87ea3 100644 --- a/src/main/resources/mapper/pms/AgencyMatterMapper.xml +++ b/src/main/resources/mapper/pms/AgencyMatterMapper.xml @@ -18,13 +18,13 @@ - SELECT * FROM plm_proofing_information WHERE id = #{proofingId} + SELECT *,id as proofing_id FROM plm_proofing_information WHERE id = #{proofingId} @@ -265,7 +266,23 @@ and project_desc like #{query.projectDesc} - and uploaded_flag = #{query.uploadedFlag} + + + + + + + + + + + AND ( @@ -346,9 +363,23 @@ ]]> - + + + + + + + + + + + - and uploaded_flag = #{query.uploadedFlag} + + + AND uploaded_flag = '已上传' + + + AND uploaded_flag != '已上传' + + + AND uploaded_flag = #{query.uploadedFlag, jdbcType=VARCHAR} + + and project_desc like #{query.projectDesc}