Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
N
njzsb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐州
njzsb
Commits
0e3b29b3
Commit
0e3b29b3
authored
Sep 01, 2022
by
徐州
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改两个问题
parent
3b964c2b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
1 deletion
+38
-1
PaymentVoucherAction.java
...jshx/account/paymentVoucher/web/PaymentVoucherAction.java
+21
-0
PaymentItemHisAction.java
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
+1
-1
sql-map-rfxm.xml
src/com/jshx/rfxm/conf/sql-map-rfxm.xml
+3
-0
Rfxm.java
src/com/jshx/rfxm/entity/Rfxm.java
+13
-0
No files found.
src/com/jshx/account/paymentVoucher/web/PaymentVoucherAction.java
View file @
0e3b29b3
...
...
@@ -13,6 +13,8 @@ import com.jshx.billlq.service.BilllqService;
import
com.jshx.common.utils.FileUtils
;
import
com.jshx.core.utils.StringUtil
;
import
com.jshx.core.utils.Struts2Util
;
import
com.jshx.rfxm.entity.Rfxm
;
import
com.jshx.rfxm.service.RfxmService
;
import
com.jshx.spjlb.entity.Spjlb
;
import
com.jshx.spjlb.service.SpjlbService
;
import
com.jshx.wwjdclinfo.entity.Wwjdclinfo
;
...
...
@@ -114,6 +116,8 @@ public class PaymentVoucherAction extends BaseAction
private
PaymentItemHis
paymentItemHis
=
new
PaymentItemHis
();
private
Rfxm
rfxm
;
private
PaymentItemDelayHis
paymentItemDelayHis
=
new
PaymentItemDelayHis
();
private
Mjyj
mjyj
=
new
Mjyj
();
...
...
@@ -144,6 +148,9 @@ public class PaymentVoucherAction extends BaseAction
@Autowired
private
PaymentItemHisService
paymentItemHisService
;
@Autowired
private
RfxmService
rfxmService
;
@Autowired
private
PaymentItemDelayService
paymentItemDelayService
;
...
...
@@ -552,6 +559,13 @@ public class PaymentVoucherAction extends BaseAction
currentDate
=
outSdf
.
format
(
new
Date
());
try
{
paymentItemHis
=
paymentItemHisService
.
getById
(
id
);
Map
<
String
,
Object
>
param
=
new
HashMap
<>();
param
.
put
(
"paymentHisId"
,
paymentItemHis
.
getId
());
List
<
Rfxm
>
rfxmList
=
rfxmService
.
findRfxm
(
param
);
if
(
rfxmList
!=
null
&&
rfxmList
.
size
()
>
0
)
{
rfxm
=
rfxmList
.
get
(
0
);
}
if
(
null
!=
paymentItemHis
){
//获取项目信息
xmxxb
=
xmxxbService
.
getById
(
paymentItemHis
.
getXmbzj
());
...
...
@@ -2055,4 +2069,11 @@ public class PaymentVoucherAction extends BaseAction
this
.
wwjdclinfos
=
wwjdclinfos
;
}
public
Rfxm
getRfxm
()
{
return
rfxm
;
}
public
void
setRfxm
(
Rfxm
rfxm
)
{
this
.
rfxm
=
rfxm
;
}
}
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @
0e3b29b3
...
...
@@ -270,7 +270,7 @@ public class PaymentItemHisAction extends BaseAction
rfxm
.
setXmbh
(
model
.
getXmxxb
().
getXmbh
());
rfxm
.
setMjyj
(
model
.
getXmxxb
().
getMjyj
());
rfxm
.
setIsSl
(
"002"
.
equals
(
model
.
getXmxxb
().
getMjyj
())
||
"004"
.
equals
(
model
.
getXmxxb
().
getMjyj
())
?
1
:
0
);
rfxm
.
setJbr
(
this
.
getLoginUser
().
getDisplayName
());
//经办人
rfxm
.
setIsSbj
(!
model
.
getXmxxb
().
getZsfw
().
contains
(
"非市本级"
)
?
1
:
0
);
rfxm
.
setIsRfyz
(
0
);
rfxm
.
setIsTqdy
(
0
);
...
...
src/com/jshx/rfxm/conf/sql-map-rfxm.xml
View file @
0e3b29b3
...
...
@@ -29,6 +29,9 @@
<isNotEmpty
property=
"paymentLink"
>
<![CDATA[and t.paymentLink = :paymentLink]]>
</isNotEmpty>
<isNotEmpty
property=
"paymentHisId"
>
<![CDATA[and t.paymentHisId = :paymentHisId]]>
</isNotEmpty>
<isNotEmpty
property=
"isRfyz"
>
<![CDATA[and t.isRfyz = :isRfyz]]>
</isNotEmpty>
...
...
src/com/jshx/rfxm/entity/Rfxm.java
View file @
0e3b29b3
...
...
@@ -278,6 +278,19 @@ public class Rfxm extends BaseModel
*/
private
String
paymentHisId
;
/**
* 经办人
*/
public
String
jbr
;
public
String
getJbr
()
{
return
jbr
;
}
public
void
setJbr
(
String
jbr
)
{
this
.
jbr
=
jbr
;
}
public
String
getMjyj
()
{
return
mjyj
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment