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
b13531d8
Commit
b13531d8
authored
Oct 09, 2022
by
徐州
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分问题
parent
65d7891f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
8 deletions
+19
-8
PaymentVoucherPrint_GuiHua.jsp
...ges/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
+1
-1
Jfzm_view.jsp
WebRoot/WEB-INF/pages/jfzm/Jfzm_view.jsp
+12
-4
AccountBankServiceImpl.java
...ount/accountBank/service/impl/AccountBankServiceImpl.java
+5
-2
AccountBankAction.java
src/com/jshx/account/accountBank/web/AccountBankAction.java
+1
-1
No files found.
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @
b13531d8
...
...
@@ -656,7 +656,7 @@
<div
id=
'33'
draggable=
'true'
class=
'f33'
>
${paymentItemHis.zslxdbh}
</div>
<div
id=
'34'
draggable=
'true'
class=
'f34'
>
${paymentItemHis.jbr}
${rfxm.jbr}
</div>
<c:if
test=
"${paymentItemHis.isCwyz!='0'}"
>
<div
id=
'37'
draggable=
'true'
class=
'f37'
><img
src=
"
`${ctx}/images/img/`
zhang1.png"
alt=
""
></div>
<div
id=
'37'
draggable=
'true'
class=
'f37'
><img
src=
"
${ctx}/images/img/
zhang1.png"
alt=
""
></div>
</c:if>
<div
id=
'36'
draggable=
'true'
class=
'f36'
><img
src=
"${ctx}/images/img/zhang3.png"
alt=
""
></div>
...
...
WebRoot/WEB-INF/pages/jfzm/Jfzm_view.jsp
View file @
b13531d8
...
...
@@ -42,6 +42,15 @@
left
:
270px
;
top
:
340px
}
/*内部使用*/
.f35
,
.f40
{
left
:
480px
;
top
:
358px
;
color
:
red
;
font-size
:
24px
;
z-index
:
99
;
text-align
:
center
;
}
.f21
{
left
:
270px
;
...
...
@@ -363,7 +372,8 @@
async
:
false
,
data
:{
xxylb
:
'${rfxm.xxylbbh}'
,
file
:
img
fileBase64
:
img
,
id
:
'缴费凭证.png'
},
error
:
function
(){
$
.
messager
.
alert
(
'错误'
,
'同步施工许可证失败!'
);
...
...
@@ -403,9 +413,7 @@
<div
id=
'f30'
draggable=
'true'
class=
'f30'
>
规划许可证号:${xmxxb.xkzh}
</div>
<div
id=
'f31'
draggable=
'true'
class=
'f31'
>
规划项目编号:${xmxxb.xmbh}
</div>
<div
id=
'33'
draggable=
'true'
class=
'f33'
>
${paymentItemHis.zslxdbh}
</div>
<c:if
test=
"${rfxm.isRfyz=='1'}"
>
<div
id=
'37'
draggable=
'true'
class=
'f37'
><img
src=
"${ctx}/images/img/zhang_half.png"
alt=
""
></div>
</c:if>
<div
id=
'37'
draggable=
'true'
class=
'f37'
><img
src=
"${ctx}/images/img/zhang_half.png"
alt=
""
></div>
<c:choose>
<c:when
test=
"${empty rfxm}"
>
...
...
src/com/jshx/account/accountBank/service/impl/AccountBankServiceImpl.java
View file @
b13531d8
...
...
@@ -252,7 +252,10 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa
xmxxbService
.
update
(
xmxxb
);
//生成已缴款项目记录
transformHis
(
paymentItemHis
,
paymentItemPending
,
ids
);
paymentItemHis
.
setOperatorId
(
userId
);
paymentItemHis
.
setIsCreateJfpz
(
"0"
);
paymentItemHis
.
setIsCwyz
(
"0"
);
if
(
Constant
.
HASINVOICE_YES
.
equals
(
outcome
)){
paymentItemHis
.
setPrintFlag
(
Constant
.
PRINT_PRIV
);
...
...
@@ -264,7 +267,7 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa
Spjlb
s
=
spjlbService
.
getByslbh
(
paymentItemPending
.
getSlbh
());
if
(
null
!=
s
){
s
.
setYqrgzl
(
aaa
);
User
u
=
userService
.
findUserBy
Login
Id
(
userId
);
User
u
=
userService
.
findUserById
(
userId
);
s
.
setYqrr
(
u
.
getDisplayName
());
s
.
setYqrsj
(
new
Date
());
spjlbService
.
update
(
s
);
...
...
src/com/jshx/account/accountBank/web/AccountBankAction.java
View file @
b13531d8
...
...
@@ -410,7 +410,7 @@ public class AccountBankAction extends BaseAction
{
if
(
orderId
!=
null
&&
!
orderId
.
trim
().
equals
(
""
))
{
accountBankService
.
accountConfirmPending
(
orderId
,
ids
,
outcome
,
this
.
getLoginUser
().
get
Login
Id
(),
identityService
,
runtimeService
);
accountBankService
.
accountConfirmPending
(
orderId
,
ids
,
outcome
,
this
.
getLoginUser
().
getId
(),
identityService
,
runtimeService
);
}
}
}
...
...
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