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
fb9fca8e
Commit
fb9fca8e
authored
Oct 13, 2022
by
徐州
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分问题
parent
2bab0098
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
11 deletions
+10
-11
PaymentVoucherPrint_GuiHua.jsp
...ges/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
+0
-1
jfzm_print.jsp
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
+3
-3
PaymentVoucherAction.java
...jshx/account/paymentVoucher/web/PaymentVoucherAction.java
+2
-2
PaymentItemHisAction.java
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
+1
-1
SdjdAction.java
src/com/jshx/sdjd/web/SdjdAction.java
+4
-4
No files found.
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @
fb9fca8e
...
@@ -590,7 +590,6 @@
...
@@ -590,7 +590,6 @@
</form>
</form>
<div
id=
"page1"
class=
'only_for_print pagestyle'
style=
'width:210mm;height:140mm;position:relative;'
>
<div
id=
"page1"
class=
'only_for_print pagestyle'
style=
'width:210mm;height:140mm;position:relative;'
>
<img
class=
'screen-only'
src=
"${ctx}/images/img/gz.jpg"
style=
"position:absolute;width:100%;height:100%"
/>
<img
class=
'screen-only'
src=
"${ctx}/images/img/gz.jpg"
style=
"position:absolute;width:100%;height:100%"
/>
<div
id=
'f1'
draggable=
'true'
class=
'f1'
>
${xmxxb.xxylb}
</div>
<c:choose>
<c:choose>
<c:when
test=
"${fn:length(xmxxb.xxylb) <= 28 }"
>
<!--如果 -->
<c:when
test=
"${fn:length(xmxxb.xxylb) <= 28 }"
>
<!--如果 -->
<div
id=
'f1'
draggable=
'true'
<div
id=
'f1'
draggable=
'true'
...
...
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
View file @
fb9fca8e
...
@@ -346,7 +346,7 @@
...
@@ -346,7 +346,7 @@
})
})
function
doPrint
()
{
function
doPrint
()
{
var
numSz
=
2
var
numSz
=
2
if
(
$
{
rfxm
.
mjyj
==
'00
2'
}
||
$
{
rfxm
.
mjyj
==
'00
4'
}
){
if
(
$
{
rfxm
.
mjyj
==
'004'
}
){
numSz
=
1
numSz
=
1
}
else
{
}
else
{
numSz
=
2
numSz
=
2
...
@@ -388,7 +388,7 @@
...
@@ -388,7 +388,7 @@
</div>
</div>
</form>
</form>
横联
横联
<c:if
test=
"${rfxm.mjyj != '00
2' && rfxm.mjyj != '00
4'}"
>
<c:if
test=
"${rfxm.mjyj != '004'}"
>
<div
id=
"page1"
class=
'only_for_print pagestyle'
style=
'width:210mm;height:140mm;position:relative;'
>
<div
id=
"page1"
class=
'only_for_print pagestyle'
style=
'width:210mm;height:140mm;position:relative;'
>
<img
class=
'screen-only'
src=
"${ctx}/images/img/gz.jpg"
style=
"position:absolute;width:100%;height:100%"
/>
<img
class=
'screen-only'
src=
"${ctx}/images/img/gz.jpg"
style=
"position:absolute;width:100%;height:100%"
/>
...
@@ -516,7 +516,7 @@
...
@@ -516,7 +516,7 @@
</c:if>
</c:if>
竖联
竖联
<c:if
test=
"${rfxm.mjyj == '00
2' || rfxm.mjyj == '00
4'}"
>
<c:if
test=
"${rfxm.mjyj == '004'}"
>
<div
id=
"page1"
class=
'only_for_print pagestyle'
style=
'width:210mm;height:140mm;position:relative;'
>
<div
id=
"page1"
class=
'only_for_print pagestyle'
style=
'width:210mm;height:140mm;position:relative;'
>
<img
src=
"${ctx}/webResources/images/newfgb1.jpg"
style=
"position:absolute;width:100%;height:100%"
/>
<img
src=
"${ctx}/webResources/images/newfgb1.jpg"
style=
"position:absolute;width:100%;height:100%"
/>
<div
id=
'f111'
draggable=
'true'
class=
'f111'
>
${paymentItemHis.ECN}
</div>
<div
id=
'f111'
draggable=
'true'
class=
'f111'
>
${paymentItemHis.ECN}
</div>
...
...
src/com/jshx/account/paymentVoucher/web/PaymentVoucherAction.java
View file @
fb9fca8e
...
@@ -1617,8 +1617,8 @@ public class PaymentVoucherAction extends BaseAction
...
@@ -1617,8 +1617,8 @@ public class PaymentVoucherAction extends BaseAction
{
{
dwdm
=
StringUtil
.
isEmpty
(
xmxxb
.
getDwdm
())?
zsdwService
.
getDwdm
(
this
.
getLoginUserDepartmentId
()):
xmxxb
.
getDwdm
();
dwdm
=
StringUtil
.
isEmpty
(
xmxxb
.
getDwdm
())?
zsdwService
.
getDwdm
(
this
.
getLoginUserDepartmentId
()):
xmxxb
.
getDwdm
();
}
}
//
String result3 = CommonAction.send2wwSGXK(xmxxb,null,dwdm,map);//arvin1122
String
result3
=
CommonAction
.
send2wwSGXK
(
xmxxb
,
null
,
dwdm
,
map
);
//arvin1122
String
result3
=
"true"
;
//
String result3 = "true";
// String result3 = com.jshx.module.admin.web.action.CommonAction.send2ww(map,null);
// String result3 = com.jshx.module.admin.web.action.CommonAction.send2ww(map,null);
if
(
StringUtil
.
isEmpty
(
result3
)||
"false"
.
equals
(
result3
))
{
if
(
StringUtil
.
isEmpty
(
result3
)||
"false"
.
equals
(
result3
))
{
...
...
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @
fb9fca8e
...
@@ -275,7 +275,7 @@ public class PaymentItemHisAction extends BaseAction
...
@@ -275,7 +275,7 @@ public class PaymentItemHisAction extends BaseAction
rfxm
.
setXmdm
(
model
.
getXmxxb
().
getLxpw
());
rfxm
.
setXmdm
(
model
.
getXmxxb
().
getLxpw
());
rfxm
.
setXmbh
(
model
.
getXmxxb
().
getXmbh
());
rfxm
.
setXmbh
(
model
.
getXmxxb
().
getXmbh
());
rfxm
.
setMjyj
(
model
.
getXmxxb
().
getMjyj
());
rfxm
.
setMjyj
(
model
.
getXmxxb
().
getMjyj
());
rfxm
.
setIsSl
(
"00
2"
.
equals
(
model
.
getXmxxb
().
getMjyj
())
||
"00
4"
.
equals
(
model
.
getXmxxb
().
getMjyj
())
?
1
:
0
);
rfxm
.
setIsSl
(
"004"
.
equals
(
model
.
getXmxxb
().
getMjyj
())
?
1
:
0
);
rfxm
.
setIsSbj
(
model
.
getXmxxb
().
getJsdd
()
!=
null
&&
model
.
getXmxxb
().
getJsdd
().
contains
(
"南京市江宁区"
)
?
0
:
1
);
rfxm
.
setIsSbj
(
model
.
getXmxxb
().
getJsdd
()
!=
null
&&
model
.
getXmxxb
().
getJsdd
().
contains
(
"南京市江宁区"
)
?
0
:
1
);
rfxm
.
setIsRfyz
(
0
);
rfxm
.
setIsRfyz
(
0
);
rfxm
.
setIsTqdy
(
0
);
rfxm
.
setIsTqdy
(
0
);
...
...
src/com/jshx/sdjd/web/SdjdAction.java
View file @
fb9fca8e
...
@@ -935,8 +935,8 @@ public class SdjdAction extends BaseAction
...
@@ -935,8 +935,8 @@ public class SdjdAction extends BaseAction
// daima=listzsdw.get(0).getZsdm();
// daima=listzsdw.get(0).getZsdm();
// }
// }
//项目流水号
//项目流水号
//
String lsh=genericManager.getSN("lsh");//TODO arvin1122
String
lsh
=
genericManager
.
getSN
(
"lsh"
);
//TODO arvin1122
String
lsh
=
System
.
currentTimeMillis
()
+
""
;
//
String lsh = System.currentTimeMillis() + "";
xmb
.
setXmlsh
(
lsh
);
xmb
.
setXmlsh
(
lsh
);
//项目受理编号
//项目受理编号
// String sli=genericManager.getSN(daima);
// String sli=genericManager.getSN(daima);
...
@@ -955,8 +955,8 @@ public class SdjdAction extends BaseAction
...
@@ -955,8 +955,8 @@ public class SdjdAction extends BaseAction
}
}
if
(
"001"
.
equals
(
s
.
getMjyj
())||
"005"
.
equals
(
s
.
getMjyj
()))
if
(
"001"
.
equals
(
s
.
getMjyj
())||
"005"
.
equals
(
s
.
getMjyj
()))
{
{
String
result
=
"OK"
;
//
String result = "OK";
//
String result = CommonAction.send2wwSGXK(xmb,null,dwdm,null);//TODO arvin1122
String
result
=
CommonAction
.
send2wwSGXK
(
xmb
,
null
,
dwdm
,
null
);
//TODO arvin1122
if
(
"false"
.
equals
(
result
)
||
StringUtil
.
isEmpty
(
result
))
if
(
"false"
.
equals
(
result
)
||
StringUtil
.
isEmpty
(
result
))
{
{
return
Boolean
.
FALSE
;
return
Boolean
.
FALSE
;
...
...
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