Commit b13531d8 authored by 徐州's avatar 徐州

修改部分问题

parent 65d7891f
...@@ -656,7 +656,7 @@ ...@@ -656,7 +656,7 @@
<div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div> <div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div> <div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}"> <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> </c:if>
<div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div> <div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
......
...@@ -42,6 +42,15 @@ ...@@ -42,6 +42,15 @@
left: 270px; left: 270px;
top: 340px top: 340px
} }
/*内部使用*/
.f35,.f40 {
left: 480px;
top: 358px;
color: red;
font-size: 24px;
z-index: 99;
text-align: center;
}
.f21 { .f21 {
left: 270px; left: 270px;
...@@ -363,7 +372,8 @@ ...@@ -363,7 +372,8 @@
async : false, async : false,
data:{ data:{
xxylb: '${rfxm.xxylbbh}', xxylb: '${rfxm.xxylbbh}',
file : img fileBase64 : img,
id: '缴费凭证.png'
}, },
error: function(){ error: function(){
$.messager.alert('错误','同步施工许可证失败!'); $.messager.alert('错误','同步施工许可证失败!');
...@@ -403,9 +413,7 @@ ...@@ -403,9 +413,7 @@
<div id='f30' draggable='true' class='f30'>规划许可证号:${xmxxb.xkzh}</div> <div id='f30' draggable='true' class='f30'>规划许可证号:${xmxxb.xkzh}</div>
<div id='f31' draggable='true' class='f31'>规划项目编号:${xmxxb.xmbh}</div> <div id='f31' draggable='true' class='f31'>规划项目编号:${xmxxb.xmbh}</div>
<div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</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>
<div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang_half.png" alt=""></div>
</c:if>
<c:choose> <c:choose>
<c:when test="${empty rfxm}"> <c:when test="${empty rfxm}">
......
...@@ -252,7 +252,10 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa ...@@ -252,7 +252,10 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa
xmxxbService.update(xmxxb); xmxxbService.update(xmxxb);
//生成已缴款项目记录 //生成已缴款项目记录
transformHis(paymentItemHis,paymentItemPending,ids); transformHis(paymentItemHis,paymentItemPending,ids);
paymentItemHis.setOperatorId(userId);
paymentItemHis.setIsCreateJfpz("0");
paymentItemHis.setIsCwyz("0");
if(Constant.HASINVOICE_YES.equals(outcome)){ if(Constant.HASINVOICE_YES.equals(outcome)){
paymentItemHis.setPrintFlag(Constant.PRINT_PRIV); paymentItemHis.setPrintFlag(Constant.PRINT_PRIV);
...@@ -264,7 +267,7 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa ...@@ -264,7 +267,7 @@ public class AccountBankServiceImpl extends BaseServiceImpl implements AccountBa
Spjlb s=spjlbService.getByslbh(paymentItemPending.getSlbh()); Spjlb s=spjlbService.getByslbh(paymentItemPending.getSlbh());
if(null!=s){ if(null!=s){
s.setYqrgzl(aaa); s.setYqrgzl(aaa);
User u= userService.findUserByLoginId(userId); User u= userService.findUserById(userId);
s.setYqrr(u.getDisplayName()); s.setYqrr(u.getDisplayName());
s.setYqrsj(new Date()); s.setYqrsj(new Date());
spjlbService.update(s); spjlbService.update(s);
......
...@@ -410,7 +410,7 @@ public class AccountBankAction extends BaseAction ...@@ -410,7 +410,7 @@ public class AccountBankAction extends BaseAction
{ {
if(orderId!=null && !orderId.trim().equals("")) if(orderId!=null && !orderId.trim().equals(""))
{ {
accountBankService.accountConfirmPending(orderId, ids, outcome, this.getLoginUser().getLoginId(), identityService, runtimeService); accountBankService.accountConfirmPending(orderId, ids, outcome, this.getLoginUser().getId(), identityService, runtimeService);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment