From 043d20db84f1557523487fc21373322e43ff4ba3 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 14 Aug 2025 15:06:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=9F=E4=BA=A7=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=20one=5Fproject=5Ftype?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=EF=BC=8C=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E5=AE=A1=E6=A0=B8=E6=97=A5=E6=9C=9F=20examine=5Fstatu?=
 =?UTF-8?q?s=20=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ae/comf/bd/entity/vo/MdmDBQueryVO.java      |  2 ++
 .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml       |  2 ++
 .../ae/generate/core/vo/CreateVoucherVO.java    |  8 ++++++++
 .../impl/AePushVoucherLogServiceImpl.java       | 17 +++++++++++++++++
 4 files changed, 29 insertions(+)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
index 11c897b0..9944e98c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
@@ -19,6 +19,7 @@ public class MdmDBQueryVO extends BaseEntity {
     private String prop8;
     private String prop9;
     private String prop10;
+    private String prop11;
 
     private String propValue1;
     private String propValue2;
@@ -30,6 +31,7 @@ public class MdmDBQueryVO extends BaseEntity {
     private String propValue8;
     private String propValue9;
     private String propValue10;
+    private String propValue11;
 
     private String pkentityorg;
     private String billstatus;
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
index 9dd28b50..3526e078 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
@@ -72,6 +72,7 @@
 
 
     <!-- 生成日志界面使用的查需数据 -->
+    <!-- prop11 生成界面 审核状态使用 -->
     <select id="queryDataByMdmId" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map">
         select
         *
@@ -88,6 +89,7 @@
             <if test="prop8 !=null and propValue8 != null">and ${prop8}=#{propValue8}</if>
             <if test="prop9 !=null and propValue9 != null">and ${prop9}=#{propValue9}</if>
             <if test="prop10 !=null and propValue10 != null">and ${prop10}=#{propValue10}</if>
+            <if test="prop11 !=null and propValue11 != null">and ${prop11} is ${propValue11}</if>
             <if test="billstatus !=null and billstatus != ''">and billstatus = #{billstatus}</if>
         </trim>
     </select>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java
index 43acd9aa..f17f110a 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java
@@ -33,6 +33,14 @@ public class CreateVoucherVO extends BaseEntity {
      * 项目编码
      */
     private String project_code;
+    /**
+     * 一级项目类型
+     */
+    private String one_project_type;
+    /**
+     * 审核状态，是否有审核日期
+     */
+    private String examine_status;
 
 
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
index 0b27d8d2..b7e421a6 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
@@ -293,6 +293,7 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
 //    }
 //
     //查需所有单据，带条件：mdmId，单据日期，项目编码project_id，单据编号，生成状态billstatus
+    //新增 一级项目类型 one_project_type ，审核状态，是否有审核日期 examine_status
     @Override
     public PageInfo queryBillPaged(CreateVoucherVO vo) {
         Assert.notNull(vo.getMdmId(), "mdmId不能为空");
@@ -351,6 +352,22 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
         mdmDBQueryVO.setProp6("project_code");
         mdmDBQueryVO.setPropValue6(vo.getProject_code());
 
+        //一级项目类型
+        if (vo.getOne_project_type() != null && !"".equals(vo.getOne_project_type())) {
+            mdmDBQueryVO.setProp7("one_project_type");
+            mdmDBQueryVO.setPropValue7(vo.getOne_project_type());
+        }
+        //审核状态，是否有审核日期 examine_status
+        String examineStatus = vo.getExamine_status();
+        if(examineStatus!=null&&"Y".equals(examineStatus)){
+            mdmDBQueryVO.setProp11("examine_date");
+            mdmDBQueryVO.setPropValue11("not null");
+        }
+        if(examineStatus!=null&&"N".equals(examineStatus)){
+            mdmDBQueryVO.setProp11("examine_date");
+            mdmDBQueryVO.setPropValue11("null");
+        }
+
         mdmDBQueryVO.setBillstatus(vo.getBillStatus());
         PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize());
         List<Map<String, Object>> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO);