修改问题

conf/jdbc.properties

@@ -48,12 +48,12 @@ db.driverClassName=oracle.jdbc.driver.OracleDriver
 #db.url = jdbc:oracle:thin:@10.1.163.147:1521/orcl
 
 # 现场测试 start -------------------------------------
-#db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
-#db.username = zsb1016
-#db.password = 123456
-db.url = jdbc:oracle:thin:@192.168.30.140:1521:orcl
-db.username = zsb1
+db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
+db.username = zsb1016
 db.password = 123456
+#db.url = jdbc:oracle:thin:@192.168.30.140:1521:orcl
+#db.username = zsb1
+#db.password = 123456
 #db.username = zsb2107
 #db.password = 123456
 ##db.username = zsb01

conf/system.properties

@@ -114,7 +114,7 @@ interfaceName=708002
 interfacePwd=123
 InterfaceOpen=Y
 
-archivesURL=http://192.168.1.101:8080/sso/indexs
+archivesURL=http://192.168.1.101:8088/sso/indexs
 duanxinKg=Y
 duanxinUrl=192.168.1.80
 duanxinDk=29090

src/com/jshx/account/accountBank/web/AccountBankAction.java

@@ -414,6 +414,7 @@ public class AccountBankAction extends BaseAction
         try {
         	//拆分多条待缴费项目信息
     		String[] orderIdArray = orderIds.split("\\|");
+			String msg = "";
     		if(null != orderIdArray)
     		{
     			for(String orderId : orderIdArray)
@@ -426,31 +427,38 @@ public class AccountBankAction extends BaseAction
 						/**
 						 * 办理时，直接生成非税通知书，不需要另外操作了
 						 */
+
 						if(!"1".equals(flag)) {
 							FstzsXm fstzsXm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh());
 							if(fstzsXm != null) {
-								fstzsXm.setStatus(1);
-								fstzsXm.setZdsc(1);
-								fstzsXm.setJbr(this.getLoginUser().getDisplayName());
-								fstzsXm.setJsdwmc(paymentItemPending.getDwmc());
-								fstzsXm.setBeizhu(fstzsXm.getSlbh() + "，共1张电子发票");
-
-								Fstzs f = new Fstzs();
-								f.setJkr(fstzsXm.getJsdwmc());
-								f.setYjje(fstzsXm.getYjje());
-								f.setYjmj(fstzsXm.getXmxxb().getCsmj());
-								f.setDelFlag(0);
-								f.setStatus(0);
-								f.setFstzsXm(fstzsXm);
-								f.setGcxmmc(fstzsXm.getGcxmmc());
-								f.setJsdwmc(fstzsXm.getJsdwmc());
-								f.setSlbh(fstzsXm.getSlbh());
-								f.setLength(1);
-								f.setIsJk(0);
-								f.setKpState(0);
-
-								fstzsXmService.update(fstzsXm);
-								fstzsService.save(f);
+								if(fstzsXm.getStatus() == 1) {
+									fstzsXm.setStatus(1);
+									fstzsXm.setZdsc(1);
+									fstzsXm.setJbr(this.getLoginUser().getDisplayName());
+									fstzsXm.setJsdwmc(paymentItemPending.getDwmc());
+									fstzsXm.setBeizhu(fstzsXm.getSlbh() + "，共1张电子发票");
+
+									Fstzs f = new Fstzs();
+									f.setJkr(fstzsXm.getJsdwmc());
+									f.setYjje(fstzsXm.getYjje());
+									f.setYjmj(fstzsXm.getXmxxb().getCsmj());
+									f.setDelFlag(0);
+									f.setStatus(0);
+									f.setFstzsXm(fstzsXm);
+									f.setGcxmmc(fstzsXm.getGcxmmc());
+									f.setJsdwmc(fstzsXm.getJsdwmc());
+									f.setSlbh(fstzsXm.getSlbh());
+									f.setLength(1);
+									f.setIsJk(0);
+									f.setKpState(0);
+
+									fstzsXmService.update(fstzsXm);
+									fstzsService.save(f);
+									msg = "同时该项目的非税通知书已变为已生成";
+								} else {
+									msg = "该项目存在已生成的非税通知书";
+								}
+
 
 							}
 						}
@@ -458,7 +466,7 @@ public class AccountBankAction extends BaseAction
 					}
     			}
     		}
-        	this.getResponse().getWriter().println("{\"result\":true,\"msg\":\"" + ("1".equals(flag) ? "办理成功！" : "办理成功! 同时该项目的非税通知书已变为已生成") + "\"}");
+        	this.getResponse().getWriter().println("{\"result\":true,\"msg\":\"" + ("1".equals(flag) ? "办理成功！" : ("办理成功! ") + msg) + "\"}");
         }catch (Exception e) {
         	logger.error(e.getMessage());
         	this.getResponse().getWriter().println("{\"result\":false}");

src/com/jshx/fstzs/fsutil/FsRequest.java

@@ -26,6 +26,7 @@ public class FsRequest {
         System.out.println("method：" + method);
         System.out.println("param：" + new Gson().toJson(data));
         Map<String, String> params = ParamsUtil.getParams(method, data);
+        System.out.println("allparam:" + new Gson().toJson(params));
         try {
             String post = HttpclientUtil.post(getProp("fs-url"), params);
 

src/com/jshx/fstzs/web/FstzsAction.java

@@ -465,10 +465,7 @@ public class FstzsAction extends BaseAction {
         String message = "OK";
         FstzsXm xm = fstzsXmService.getById(id);
         HashMap<String, Object> params = new HashMap<>();
-        params.put("slbh",xm.getSlbh());
-        params.put("status",new ArrayList<Integer>(){{
-            add(0);
-        }});
+        params.put("fsxmId",xm.getId());
         // 需要调用财政系统操作，财政返回成功之后，才可以修改入库
         List<Fstzs> list = fstzsService.findList(params);
         list.stream().forEach(f-> {