Skip to content

Commit 6a3fc65

Browse files
928255095928255095
committed
加入缴费审核页面
1 parent 2a72a03 commit 6a3fc65

File tree

19 files changed

+991
-20
lines changed

19 files changed

+991
-20
lines changed

‎java110-bean/src/main/java/com/java110/dto/payFeeAudit/PayFeeAuditDto.java‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
package com.java110.dto.payFeeAudit;
2+
3+
import com.java110.dto.PageDto;
4+
import java.io.Serializable;
5+
import java.util.Date;
6+
7+
/**
8+
* @ClassName FloorDto
9+
* @Description 缴费审核数据层封装
10+
* @Author wuxw
11+
* @Date 2019/4/24 8:52
12+
* @Version 1.0
13+
* add by wuxw 2019/4/24
14+
**/
15+
public class PayFeeAuditDto extends PageDto implements Serializable {
16+
17+
private String auditUserId;
18+
private String auditUserName;
19+
private String feeDetailId;
20+
private String state;
21+
private String message;
22+
private String communityId;
23+
private String feeId;
24+
25+
26+
private Date createTime;
27+
28+
private String statusCd = "0";
29+
30+
31+
public String getAuditUserId() {
32+
return auditUserId;
33+
}
34+
public void setAuditUserId(String auditUserId) {
35+
this.auditUserId = auditUserId;
36+
}
37+
public String getAuditUserName() {
38+
return auditUserName;
39+
}
40+
public void setAuditUserName(String auditUserName) {
41+
this.auditUserName = auditUserName;
42+
}
43+
public String getFeeDetailId() {
44+
return feeDetailId;
45+
}
46+
public void setFeeDetailId(String feeDetailId) {
47+
this.feeDetailId = feeDetailId;
48+
}
49+
public String getState() {
50+
return state;
51+
}
52+
public void setState(String state) {
53+
this.state = state;
54+
}
55+
public String getMessage() {
56+
return message;
57+
}
58+
public void setMessage(String message) {
59+
this.message = message;
60+
}
61+
public String getCommunityId() {
62+
return communityId;
63+
}
64+
public void setCommunityId(String communityId) {
65+
this.communityId = communityId;
66+
}
67+
public String getFeeId() {
68+
return feeId;
69+
}
70+
public void setFeeId(String feeId) {
71+
this.feeId = feeId;
72+
}
73+
74+
75+
public Date getCreateTime() {
76+
return createTime;
77+
}
78+
79+
public void setCreateTime(Date createTime) {
80+
this.createTime = createTime;
81+
}
82+
83+
public String getStatusCd() {
84+
return statusCd;
85+
}
86+
87+
public void setStatusCd(String statusCd) {
88+
this.statusCd = statusCd;
89+
}
90+
}

‎java110-bean/src/main/java/com/java110/po/payFeeAudit/PayFeeAuditPo.java‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
package com.java110.po.payFeeAudit;
2+
3+
import java.io.Serializable;
4+
import java.util.Date;
5+
6+
public class PayFeeAuditPo implements Serializable {
7+
8+
private String auditId;
9+
private String auditUserId;
10+
private String auditUserName;
11+
private String feeDetailId;
12+
private String statusCd = "0";
13+
private String state;
14+
private String message;
15+
private String communityId;
16+
private String feeId;
17+
public String getAuditUserId() {
18+
return auditUserId;
19+
}
20+
public void setAuditUserId(String auditUserId) {
21+
this.auditUserId = auditUserId;
22+
}
23+
public String getAuditUserName() {
24+
return auditUserName;
25+
}
26+
public void setAuditUserName(String auditUserName) {
27+
this.auditUserName = auditUserName;
28+
}
29+
public String getFeeDetailId() {
30+
return feeDetailId;
31+
}
32+
public void setFeeDetailId(String feeDetailId) {
33+
this.feeDetailId = feeDetailId;
34+
}
35+
public String getStatusCd() {
36+
return statusCd;
37+
}
38+
public void setStatusCd(String statusCd) {
39+
this.statusCd = statusCd;
40+
}
41+
public String getState() {
42+
return state;
43+
}
44+
public void setState(String state) {
45+
this.state = state;
46+
}
47+
public String getMessage() {
48+
return message;
49+
}
50+
public void setMessage(String message) {
51+
this.message = message;
52+
}
53+
public String getCommunityId() {
54+
return communityId;
55+
}
56+
public void setCommunityId(String communityId) {
57+
this.communityId = communityId;
58+
}
59+
public String getFeeId() {
60+
return feeId;
61+
}
62+
public void setFeeId(String feeId) {
63+
this.feeId = feeId;
64+
}
65+
66+
public String getAuditId() {
67+
return auditId;
68+
}
69+
70+
public void setAuditId(String auditId) {
71+
this.auditId = auditId;
72+
}
73+
}

‎java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public class GenerateCodeFactory {
152152
public static final String CODE_PREFIX_templateId = "82";
153153
public static final String CODE_PREFIX_printId = "83";
154154
public static final String CODE_PREFIX_receiptId = "83";
155+
public static final String CODE_PREFIX_auditId = "84";
155156

156157

157158

‎java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE mapper
3+
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4+
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5+
<mapper namespace="payFeeAuditServiceDaoImpl">
6+
7+
8+
<!-- 保存缴费审核信息 add by wuxw 2018-07-03 -->
9+
<insert id="savePayFeeAuditInfo" parameterType="Map">
10+
insert into pay_fee_audit(
11+
audit_user_id,audit_user_name,fee_detail_id,state,message,community_id,fee_id,audit_id
12+
) values (
13+
#{auditUserId},#{auditUserName},#{feeDetailId},#{state},#{message},#{communityId},#{feeId},#{auditId}
14+
)
15+
</insert>
16+
17+
18+
<!-- 查询缴费审核信息 add by wuxw 2018-07-03 -->
19+
<select id="getPayFeeAuditInfo" parameterType="Map" resultType="Map">
20+
select t.audit_user_id,t.audit_user_id auditUserId,t.audit_user_name,t.audit_user_name
21+
auditUserName,t.fee_detail_id,t.fee_detail_id feeDetailId,t.status_cd,t.status_cd
22+
statusCd,t.state,t.message,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,
23+
t.audit_id auditId
24+
from pay_fee_audit t
25+
where 1 =1
26+
<if test="auditUserId !=null and auditUserId != ''">
27+
and t.audit_user_id= #{auditUserId}
28+
</if>
29+
<if test="auditUserName !=null and auditUserName != ''">
30+
and t.audit_user_name= #{auditUserName}
31+
</if>
32+
<if test="feeDetailId !=null and feeDetailId != ''">
33+
and t.fee_detail_id= #{feeDetailId}
34+
</if>
35+
<if test="statusCd !=null and statusCd != ''">
36+
and t.status_cd= #{statusCd}
37+
</if>
38+
<if test="state !=null and state != ''">
39+
and t.state= #{state}
40+
</if>
41+
<if test="message !=null and message != ''">
42+
and t.message= #{message}
43+
</if>
44+
<if test="communityId !=null and communityId != ''">
45+
and t.community_id= #{communityId}
46+
</if>
47+
<if test="feeId !=null and feeId != ''">
48+
and t.fee_id= #{feeId}
49+
</if>
50+
<if test="auditId !=null and auditId != ''">
51+
and t.audit_id= #{auditId}
52+
</if>
53+
order by t.create_time desc
54+
<if test="page != -1 and page != null ">
55+
limit #{page}, #{row}
56+
</if>
57+
58+
</select>
59+
60+
61+
<!-- 修改缴费审核信息 add by wuxw 2018-07-03 -->
62+
<update id="updatePayFeeAuditInfo" parameterType="Map">
63+
update pay_fee_audit t set t.status_cd = #{statusCd}
64+
<if test="newBId != null and newBId != ''">
65+
,t.b_id = #{newBId}
66+
</if>
67+
<if test="auditUserId !=null and auditUserId != ''">
68+
, t.audit_user_id= #{auditUserId}
69+
</if>
70+
<if test="auditUserName !=null and auditUserName != ''">
71+
, t.audit_user_name= #{auditUserName}
72+
</if>
73+
<if test="feeDetailId !=null and feeDetailId != ''">
74+
, t.fee_detail_id= #{feeDetailId}
75+
</if>
76+
<if test="state !=null and state != ''">
77+
, t.state= #{state}
78+
</if>
79+
<if test="message !=null and message != ''">
80+
, t.message= #{message}
81+
</if>
82+
<if test="communityId !=null and communityId != ''">
83+
, t.community_id= #{communityId}
84+
</if>
85+
<if test="feeId !=null and feeId != ''">
86+
, t.fee_id= #{feeId}
87+
</if>
88+
where 1=1
89+
<if test="auditId !=null and auditId != ''">
90+
and t.audit_id= #{auditId}
91+
</if>
92+
</update>
93+
94+
<!-- 查询缴费审核数量 add by wuxw 2018-07-03 -->
95+
<select id="queryPayFeeAuditsCount" parameterType="Map" resultType="Map">
96+
select count(1) count
97+
from pay_fee_audit t
98+
where 1 =1
99+
<if test="auditUserId !=null and auditUserId != ''">
100+
and t.audit_user_id= #{auditUserId}
101+
</if>
102+
<if test="auditUserName !=null and auditUserName != ''">
103+
and t.audit_user_name= #{auditUserName}
104+
</if>
105+
<if test="feeDetailId !=null and feeDetailId != ''">
106+
and t.fee_detail_id= #{feeDetailId}
107+
</if>
108+
<if test="statusCd !=null and statusCd != ''">
109+
and t.status_cd= #{statusCd}
110+
</if>
111+
<if test="state !=null and state != ''">
112+
and t.state= #{state}
113+
</if>
114+
<if test="message !=null and message != ''">
115+
and t.message= #{message}
116+
</if>
117+
<if test="communityId !=null and communityId != ''">
118+
and t.community_id= #{communityId}
119+
</if>
120+
<if test="feeId !=null and feeId != ''">
121+
and t.fee_id= #{feeId}
122+
</if>
123+
<if test="auditId !=null and auditId != ''">
124+
and t.audit_id= #{auditId}
125+
</if>
126+
127+
128+
</select>
129+
130+
</mapper>

‎java110-generator/src/main/resources/newBack/template_1.json‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
{
22
"autoMove": true,
3-
"id": "detailId",
4-
"name": "feeManualCollectionDetail",
5-
"desc": "托收明细",
3+
"id": "auditId",
4+
"name": "payFeeAudit",
5+
"desc": "缴费审核",
66
"shareParam": "communityId",
77
"shareColumn": "community_id",
88
"shareName": "fee",
9-
"tableName": "fee_manual_collection_detail",
9+
"tableName": "pay_fee_audit",
1010
"param": {
11-
"collectionId": "collection_id",
12-
"detailId": "detail_id",
1311
"feeId": "fee_id",
14-
"feeName": "fee_name",
15-
"startTime": "start_time",
16-
"endTime": "end_time",
17-
"amount": "amount",
12+
"feeDetailId": "fee_detail_id",
13+
"message": "message",
14+
"auditUserId": "audit_user_id",
15+
"auditUserName": "audit_user_name",
1816
"communityId": "community_id",
1917
"state": "state",
2018
"statusCd": "status_cd"
@@ -24,25 +22,21 @@
2422
"code": "communityId",
2523
"msg": "小区不能为空"
2624
},
27-
{
28-
"code": "collectionId",
29-
"msg": "托收不能为空"
30-
},
3125
{
3226
"code": "feeId",
3327
"msg": "费用不能为空"
3428
},
3529
{
36-
"code": "startTime",
37-
"msg": "开始时间不能为空"
30+
"code": "auditUserId",
31+
"msg": "审核人不能为空"
3832
},
3933
{
40-
"code": "endTime",
41-
"msg": "结束时间不能为空"
34+
"code": "auditUserName",
35+
"msg": "审核人不能为空"
4236
},
4337
{
44-
"code": "amount",
45-
"msg": "金额不能为空"
38+
"code": "state",
39+
"msg": "审核状态不能为空"
4640
}
4741
]
4842
}

0 commit comments

Comments
 (0)