diff --git a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java index e2765afa..632bea5f 100644 --- a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java +++ b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java @@ -22,6 +22,10 @@ public class DictCheckTypeEntity extends BaseEntity { private String branch_code; /** 院区名称 */ private String branch_name; + /** 会计年度 */ + private String kjnd; + /** gsdm */ + private String gsdm; public String getCheck_type_code() { return check_type_code; @@ -70,5 +74,22 @@ public class DictCheckTypeEntity extends BaseEntity { public void setBranch_name(String branch_name) { this.branch_name = branch_name; } + + + public String getKjnd() { + return kjnd; + } + + public void setKjnd(String kjnd) { + this.kjnd = kjnd; + } + + public String getGsdm() { + return gsdm; + } + + public void setGsdm(String gsdm) { + this.gsdm = gsdm; + } } diff --git a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml index 33858244..66368bc4 100644 --- a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml +++ b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml @@ -3,6 +3,8 @@ + + @@ -12,8 +14,10 @@ - check_type_code - ,check_type_name + kjnd + ,gsdm + ,check_type_code + ,check_type_name ,org_code ,org_name ,branch_code @@ -25,6 +29,8 @@ from dict_check_type + and kjnd = #{kjnd} + and gsdm = #{gsdm} and check_type_code = #{check_type_code} and check_type_name = #{check_type_name} and org_code = #{org_code} @@ -38,6 +44,8 @@ + + @@ -91,6 +105,8 @@ from dict_check_type + and kjnd = '${kjnd}' + and gsdm = '${gsdm}' and check_type_code like '%${check_type_code}%' and check_type_name like '%${check_type_name}%' and org_code like '%${org_code}%' diff --git a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java index 3b514e61..ca00e96d 100644 --- a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java +++ b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java @@ -23,6 +23,9 @@ public class DictCheckTypeEntityVo { /** 院区名称 */ private String branch_name; + private String kjnd; + private String gsdm; + public String getCheck_type_code() { return check_type_code; } @@ -70,5 +73,21 @@ public class DictCheckTypeEntityVo { public void setBranch_name(String branch_name) { this.branch_name = branch_name; } + + public String getKjnd() { + return kjnd; + } + + public void setKjnd(String kjnd) { + this.kjnd = kjnd; + } + + public String getGsdm() { + return gsdm; + } + + public void setGsdm(String gsdm) { + this.gsdm = gsdm; + } }