1、凭证生成新增搜索条件新增项目性质

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java

@@ -20,6 +20,7 @@ public class MdmDBQueryVO extends BaseEntity {
     private String prop9;
     private String prop10;
     private String prop11;
+    private String prop12;
 
     private String propValue1;
     private String propValue2;
@@ -32,6 +33,7 @@ public class MdmDBQueryVO extends BaseEntity {
     private String propValue9;
     private String propValue10;
     private String propValue11;
+    private String propValue12;
 
     private String pkentityorg;
     private String billstatus;

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml

@@ -90,6 +90,7 @@
             <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="prop12 !=null and propValue12 != null">and ${prop12} = #{propValue12}</if>
             <if test="billstatus !=null and billstatus != ''">and billstatus = #{billstatus}</if>
         </trim>
     </select>

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java

@@ -43,6 +43,19 @@ public class CreateVoucherVO extends BaseEntity {
     private String examine_status;
 
 
+    /**
+     *  【项目性质】	【投资类/非投资类】
+     */
+    private String xmxztzftz;//TZL/FTZL
+
+    public String getXmxztzftz() {
+        return xmxztzftz;
+    }
+
+    public void setXmxztzftz(String xmxztzftz) {
+        this.xmxztzftz = xmxztzftz;
+    }
+
     public String getMdmId() {
         return mdmId;
     }

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java

@@ -368,6 +368,18 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
             mdmDBQueryVO.setPropValue11("null");
         }
 
+        //xmxztzftz【项目性质】	【投资类/非投资类】 限制收款单，付款单
+        String xmxztzftz = vo.getXmxztzftz();
+        if(xmxztzftz!=null&&"TZL".equals(xmxztzftz)&&("gmoa_contract_payment_receipt".equals(mdmModuleDb.getDbName())||"gmoa_payment_order".equals(mdmModuleDb.getDbName()))){
+            mdmDBQueryVO.setProp12("xmxztzftz");
+            mdmDBQueryVO.setPropValue12("投资");
+        }
+        if(xmxztzftz!=null&&"FTZL".equals(xmxztzftz)&&("gmoa_contract_payment_receipt".equals(mdmModuleDb.getDbName())||"gmoa_payment_order".equals(mdmModuleDb.getDbName()))){
+            mdmDBQueryVO.setProp12("xmxztzftz");
+            mdmDBQueryVO.setPropValue12("非投资");
+        }
+
+
         mdmDBQueryVO.setBillstatus(vo.getBillStatus());
         PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize());
         List<Map<String, Object>> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO);

base-buildpackage/src/main/resources/application-gmprod.yml

@@ -12,7 +12,7 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/bussinesscenter_voucher_gm?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
+          url: jdbc:mysql://127.0.0.1:3306/businesscenter_voucher_gm_250907?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
           username: root
           password: bd993088e8a7c3dc5f44441617f9b4bf
           driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置