hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、生产凭证模块新增：一级项目类型 one_project_type审核状态，是否有审核日期 examine_status 搜索条件

This commit is contained in:
zhengyf 2025-08-14 15:06:37 +08:00
parent 116dc02ec3
commit 043d20db84
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ public class MdmDBQueryVO extends BaseEntity {
private String prop8; private String prop8;
private String prop9; private String prop9;
private String prop10; private String prop10;
private String prop11;
private String propValue1; private String propValue1;
private String propValue2; private String propValue2;
@ -30,6 +31,7 @@ public class MdmDBQueryVO extends BaseEntity {
private String propValue8; private String propValue8;
private String propValue9; private String propValue9;
private String propValue10; private String propValue10;
private String propValue11;
private String pkentityorg; private String pkentityorg;
private String billstatus; private String billstatus;

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

@ -72,6 +72,7 @@
<!-- 生成日志界面使用的查需数据 --> <!-- 生成日志界面使用的查需数据 -->
<!-- prop11 生成界面 审核状态使用 -->
<select id="queryDataByMdmId" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map"> <select id="queryDataByMdmId" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map">
select select
* *
@ -88,6 +89,7 @@
<if test="prop8 !=null and propValue8 != null">and ${prop8}=#{propValue8}</if> <if test="prop8 !=null and propValue8 != null">and ${prop8}=#{propValue8}</if>
<if test="prop9 !=null and propValue9 != null">and ${prop9}=#{propValue9}</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="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> <if test="billstatus !=null and billstatus != ''">and billstatus = #{billstatus}</if>
</trim> </trim>
</select> </select>

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

@ -33,6 +33,14 @@ public class CreateVoucherVO extends BaseEntity {
* 项目编码 * 项目编码
*/ */
private String project_code; private String project_code;
/**
* 一级项目类型
*/
private String one_project_type;
/**
* 审核状态，是否有审核日期
*/
private String examine_status;

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

@ -293,6 +293,7 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
// } // }
// //
//查需所有单据，带条件：mdmId，单据日期，项目编码project_id，单据编号，生成状态billstatus //查需所有单据，带条件：mdmId，单据日期，项目编码project_id，单据编号，生成状态billstatus
//新增 一级项目类型 one_project_type ，审核状态，是否有审核日期 examine_status
@Override @Override
public PageInfo queryBillPaged(CreateVoucherVO vo) { public PageInfo queryBillPaged(CreateVoucherVO vo) {
Assert.notNull(vo.getMdmId(), "mdmId不能为空"); Assert.notNull(vo.getMdmId(), "mdmId不能为空");
@ -351,6 +352,22 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
mdmDBQueryVO.setProp6("project_code"); mdmDBQueryVO.setProp6("project_code");
mdmDBQueryVO.setPropValue6(vo.getProject_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()); mdmDBQueryVO.setBillstatus(vo.getBillStatus());
PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize()); PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize());
List<Map<String, Object>> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO); List<Map<String, Object>> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO);