Commit fb9fca8e authored by 徐州's avatar 徐州

修改部分问题

parent 2bab0098
...@@ -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'
......
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
}) })
function doPrint() { function doPrint() {
var numSz = 2 var numSz = 2
if(${rfxm.mjyj== '002'} || ${rfxm.mjyj== '004'} ){ 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 != '002' && rfxm.mjyj != '004'}"> <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 == '002' || rfxm.mjyj == '004'}"> <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>
......
...@@ -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)) {
......
...@@ -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("002".equals(model.getXmxxb().getMjyj()) || "004".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);
......
...@@ -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;
......
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