Commit 51ab84a3 by liuyang

2024-10-08 采购收票修复供应商条件查询

parent 4ba4233d
...@@ -54,6 +54,7 @@ public class HGCW012A extends DaoEPBase { ...@@ -54,6 +54,7 @@ public class HGCW012A extends DaoEPBase {
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 记录修改时间*/ public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 记录修改时间*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/ public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
public static final String FIELD_PARTY_B = "partyB"; /* 供应商名称*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
...@@ -103,6 +104,7 @@ public class HGCW012A extends DaoEPBase { ...@@ -103,6 +104,7 @@ public class HGCW012A extends DaoEPBase {
private String contractName = " "; /* 合同名称*/ private String contractName = " "; /* 合同名称*/
private String settlementNumber = " "; /* 结算编号*/ private String settlementNumber = " "; /* 结算编号*/
private Integer settlementType; /* 结算类别;1部分结算2最终结算*/ private Integer settlementType; /* 结算类别;1部分结算2最终结算*/
private String partyB = " ";
private String contractDate = " "; /* 结算日期*/ private String contractDate = " "; /* 结算日期*/
private Integer taxPoints = new Integer(0); /* 税点*/ private Integer taxPoints = new Integer(0); /* 税点*/
private Integer priceTaxSeparation = new Integer(0); /* 价税分离;1是2否*/ private Integer priceTaxSeparation = new Integer(0); /* 价税分离;1是2否*/
...@@ -270,7 +272,9 @@ public class HGCW012A extends DaoEPBase { ...@@ -270,7 +272,9 @@ public class HGCW012A extends DaoEPBase {
eiColumn.setDescName("部门编码"); eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PARTY_B);
eiColumn.setDescName("供应商名称");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -736,6 +740,15 @@ public class HGCW012A extends DaoEPBase { ...@@ -736,6 +740,15 @@ public class HGCW012A extends DaoEPBase {
public void setRemainingAmount(BigDecimal remainingAmount) { public void setRemainingAmount(BigDecimal remainingAmount) {
this.remainingAmount = remainingAmount; this.remainingAmount = remainingAmount;
} }
public String getPartyB() {
return partyB;
}
public void setPartyB(String partyB) {
this.partyB = partyB;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -773,6 +786,7 @@ public class HGCW012A extends DaoEPBase { ...@@ -773,6 +786,7 @@ public class HGCW012A extends DaoEPBase {
setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName)); setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime)); setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode)); setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
setPartyB(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_B)), partyB));
} }
/** /**
...@@ -811,6 +825,7 @@ public class HGCW012A extends DaoEPBase { ...@@ -811,6 +825,7 @@ public class HGCW012A extends DaoEPBase {
map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME))); map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME))); map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE))); map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
map.put(FIELD_PARTY_B, StringUtils.toString(partyB, eiMetadata.getMeta(FIELD_PARTY_B)));
return map; return map;
} }
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</isNotEmpty> </isNotEmpty>
</sql> </sql>
<select id="query" parameterClass="java.util.HashMap" <select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.hggp.hg.cw.domain.HGCW008"> resultClass="com.baosight.hggp.hg.cw.domain.HGCW012A">
SELECT SELECT
<include refid="column"/> <include refid="column"/>
FROM ${hggpSchema}.HGCW008 T1 LEFT JOIN ${hggpSchema}.HGCW002 B FROM ${hggpSchema}.HGCW008 T1 LEFT JOIN ${hggpSchema}.HGCW002 B
...@@ -576,8 +576,8 @@ ...@@ -576,8 +576,8 @@
<isNotEmpty prepend=" AND " property="projName"> <isNotEmpty prepend=" AND " property="projName">
A.PROJ_NAME LIKE CONCAT('%', #projName# ,'%') A.PROJ_NAME LIKE CONCAT('%', #projName# ,'%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="supCode"> <isNotEmpty prepend=" AND " property="supName">
B.SUP_CODE = #supCode# B.SUP_NAME like concat('%',#supName#,'%')
</isNotEmpty> </isNotEmpty>
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment