修改了部分问题，2022-10-17上线版本

WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucher_ZslxdList.jsp

@@ -33,12 +33,13 @@
 									},
 									success:function (data) {
 										if(data.result) {
+											search_paymentItemHis();
 											printZslxd(row_Id,data.zslxdbh,data.mjyj)
 										}
 									}
 								});
 
-								search_paymentItemHis();
+
 							}
 
 						});
@@ -53,7 +54,7 @@
 
 		function cwyz(row_Id){
 			$.ajax({
-				url : "${ctx}/jsp/paymentVoucher/checkPoject1.action",
+				url : "${ctx}/jsp/paymentVoucher/checkCwyz.action",
 				type: 'post',
 				dataType: 'json',
 				data:{

WebRoot/WEB-INF/pages/common/index.jsp

@@ -56,7 +56,7 @@
 
         function njnk(){
           var loginId = '${curr_user.loginId}';
-          window.open("http://202.102.101.92:18088/njnktester/dddl/doLogin?loginId="+loginId);
+          window.open("http://192.168.1.101:18080/njnk/home");
 		}
 
         $(document).ready(function() {

WebRoot/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp

@@ -13,7 +13,7 @@
             var slb="${xmxxb.slbh}";
             var dan="";
             var dan=slb.substr(0,4)+slb.substr(slb.length-3,3)+"${xmxxb.dwdm}";
-            var text = "缴费凭证";
+            var text = "一般缴款书";
             text=text+"_"+dan;
             console.log(text);
             window.open('${ctx}/scan.jsp?id='+encodeURIComponent(text));

WebRoot/WEB-INF/pages/jfzm/Jfzm_view.jsp

@@ -410,7 +410,7 @@
                     dataType: 'json',
                     async : false,
                     data:{
-                        xxylb: '${rfxm.xxylbbh}',
+                        'xmxxb.xxylb': '${rfxm.xxylbbh}',
                         fileBase64 : img,
                         id: '缴费凭证.png'
                     },

module/com/jshx/module/admin/web/action/CommonAction.java

@@ -1834,6 +1834,7 @@ public class CommonAction extends BaseAction
      */
     public static   String send2wwSGXK(Xmxxb xmxxb,Tbshxk tbshxk,String dwdm,Map<String,String> map111)
     {
+
     	String result1 ="";
 		String isneed = "yes";
     	int i = tbshxk == null ? 0 : 1;

src/com/jshx/account/paymentVoucher/conf/struts-paymentVoucher.xml

@@ -49,6 +49,7 @@
 		<!-- 校验项目情况 -->
 		<action name ="checkPoject" class="com.jshx.account.paymentVoucher.web.PaymentVoucherAction" method="checkPoject"></action>
 		<action name ="checkPoject1" class="com.jshx.account.paymentVoucher.web.PaymentVoucherAction" method="checkPoject1"></action>
+		<action name ="checkCwyz" class="com.jshx.account.paymentVoucher.web.PaymentVoucherAction" method="checkCwyz"></action>
 		<action name ="faduanxin" class="com.jshx.account.paymentVoucher.web.PaymentVoucherAction" method="faduanxin"></action>
 		
 		<!-- 开票数据录入界面 -->

src/com/jshx/account/paymentVoucher/web/PaymentVoucherAction.java

@@ -1047,6 +1047,8 @@ public class PaymentVoucherAction extends BaseAction
 
 		this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\"" + message + "\"}");
 	}
+
+
 	public void checkPoject1() throws Exception{
 		boolean result = true;
 		String message = "成功！";
@@ -1070,14 +1072,23 @@ public class PaymentVoucherAction extends BaseAction
 			result = false;
 			message = "该项目不存在，请联系管理员！";
 		}
-//		Kpsjgl kp=kpsjglService.findbygllb("001");
-//		if(kp.getBdjg()==1){
-//			result = false;
-//			message = "非税基础数据同步有误,请联系管理员!";
-//		}
-		
+
 		this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\"" + message + "\"}");
 	}
+
+
+	public void checkCwyz() throws Exception{
+		boolean result = true;
+		String message = "成功！";
+
+		if(!this.getLoginUser().getLoginId().equals("102012") && !this.getLoginUser().getLoginId().equals("102008")) {
+			result = false;
+			message = "您没有用章权限！";
+		}
+
+		this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\"" + message + "\"}");
+	}
+
 	//发送短信
 	public void faduanxin() throws Exception{
 	    boolean result = true;

src/com/jshx/jfzm/web/JfzmAction.java

@@ -213,7 +213,7 @@ public class JfzmAction extends BaseAction {
      * @throws Exception
      */
     public void jfpztongbu() throws Exception {
-        fujiantongbu();
+        saveJfzmPng();
         xxsyncPz(xmxxb);
     }
 
@@ -247,11 +247,6 @@ public class JfzmAction extends BaseAction {
             this.getResponse().getWriter().println("{\"result\":\"false\",\"info\":\"缴费凭证未上传！\"}");
             return ;
         }
-        if( "yes".equals(flag2) && "yes".equals(xmxxb.getIstbsgxt()))
-        {
-            this.getResponse().getWriter().println("{\"result\":\"false\",\"info\":\"不可重复同步！\"}");
-            return ;
-        }
 
         PaymentItemHis paymentItemHis = paymentItemHisService.getByXmbId(xmxxb.getId());
 
@@ -366,6 +361,71 @@ public class JfzmAction extends BaseAction {
         }
     }
 
+
+    public String saveJfzmPng() throws Exception
+    {
+        xmxxb = xmxxbService.getByXxylb(xmxxb.getXxylb());
+        String fileName = "缴费凭证.png";
+        String fileName1 = "";
+        if(xmxxb != null && !TextUtils.isEmpty(xmxxb.getSlbh()) && xmxxb.getSlbh().length() > 6) {
+            fileName= "缴费凭证_" + xmxxb.getSlbh().substring(0,4) +
+                    xmxxb.getSlbh().substring(xmxxb.getSlbh().length() - 3) +
+                    xmxxb.getSlbh().substring(xmxxb.getSlbh().length() - 5,xmxxb.getSlbh().length() - 3) + ".png";
+        }
+        String rubiaopath ="";
+        //id : uploadName;ids:uploadShowName
+        String ids = "缴费凭证";
+        // 上传文件
+        String path = SysPropertiesUtil.jdlj(this.getRequest())
+                + File.separator+ "wwupload"+ File.separator+"bjcl" +File.separator+xmxxb.getXxylb()+File.separator;
+        rubiaopath = "wwupload"+ File.separator+"bjcl" +File.separator+xmxxb.getXxylb()+File.separator+fileName;
+        rubiaopath = rubiaopath.replaceAll("\\\\", "/").trim();
+        path = path.replaceAll("\\\\", "/").trim();
+        fileName1 = FileUtils.uploadFileStr(fileBase64,fileName, path);
+        Wwjdclinfo wwjdclinfo = new Wwjdclinfo();
+        wwjdclinfo.setDeptId(this.getLoginUserDepartmentId());
+        wwjdclinfo.setDelFlag(0);
+
+
+//			List<Wwsqys> ls = wwsqysService.findxxylb(xmxxb.getXxylb());
+        if(xmxxb != null && "9".equals(xmxxb.getHfsz()))
+        {
+            List<Wwsqys> wwsqyss = wwsqysService.findxxylb(xmxxb.getXxylb());
+            wwjdclinfo.setWwsqbh(wwsqyss.get(0).getWwsqbh());
+        }
+        else
+        {
+            wwjdclinfo.setWwsqbh("xxsbxm");
+        }
+
+        wwjdclinfo.setScdz(rubiaopath);
+        wwjdclinfo.setScwjm(fileName);
+        wwjdclinfo.setFjqm(ids);
+//		wwjdclinfo.setWwsqbh(wwsqys.getWwsqbh());
+        wwjdclinfo.setXxylb(xmxxb.getXxylb());
+        //查询表中是否存在，若存在则覆盖
+        Map<String, Object> paraMap = new HashMap<String, Object>();
+        Pagination pagination =new Pagination(1,100);
+        paraMap.put("xxylb",xmxxb.getXxylb());
+        paraMap.put("fjqm",ids);
+        pagination = wwjdclinfoService.findByPage(pagination,paraMap);
+        List<Wwjdclinfo> wwjdclinfos = pagination.getListOfObject();
+        if(CollectionUtils.isEmpty(wwjdclinfos))
+        {
+            wwjdclinfoService.save(wwjdclinfo);
+        }
+        else
+        {
+            Wwjdclinfo wwjdclinfo1 = wwjdclinfos.get(0);
+            wwjdclinfo1.setFjqm(ids);
+            wwjdclinfo1.setScwjm(fileName);
+            wwjdclinfo1.setScwjm(fileName);
+            wwjdclinfo1.setScdz(rubiaopath);
+            wwjdclinfoService.update(wwjdclinfo1);
+        }
+        return RELOAD;
+    }
+
     /**
      * 凭证上传
      * 先缓存至服务器
@@ -382,12 +442,7 @@ public class JfzmAction extends BaseAction {
         rubiaopath = "wwupload"+ File.separator+"bjcl" +File.separator+xmxxb.getXxylb()+File.separator+id;
         rubiaopath = rubiaopath.replaceAll("\\\\", "/").trim();
         path = path.replaceAll("\\\\", "/").trim();
-        if(fileBase64 != null) {
-            fileName1 = FileUtils.uploadFileStr(fileBase64,id, path);
-            ids = "缴费凭证";
-        } else if(file!=null && StringUtil.isNotEmpty(id)) {
-            fileName1 = FileUtils.uploadFile(file,id, path);
-        }
+        fileName1 = FileUtils.uploadFile(file,id, path);
         Wwjdclinfo wwjdclinfo = new Wwjdclinfo();
         wwjdclinfo.setDeptId(this.getLoginUserDepartmentId());
         wwjdclinfo.setDelFlag(0);
@@ -431,6 +486,7 @@ public class JfzmAction extends BaseAction {
         return RELOAD;
     }
 
+
     public String jfzm_view() {
         return print();
     }

src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java

@@ -300,6 +300,14 @@ public class PaymentItemHisAction extends BaseAction
 		model.setIsCreateJfpz("1");
 		model.setIsCwyz("0");
 		model.setZslxdbh(paymentItemHisService.getPzbh() + 1 + "");//取出历史最大 + 1
+		int length = model.getZslxdbh().length();
+		if(length < 7) {//小于7位，前面补0
+			String zero = "";
+			for (int i = 0; i < 7-length; i++) {
+				zero += "0";
+			}
+			model.setZslxdbh(zero + model.getZslxdbh());
+		}
 		model.setJfpzTime(new Date());
 		paymentItemHisService.update(model);
 		this.getResponse().getWriter().println("{\"result\":true,\"zslxdbh\":\"" + model.getZslxdbh() + "\",\"mjyj\":\"" + model.getMjyj() + "\"}");

src/com/jshx/rfxm/web/RfxmAction.java

@@ -512,6 +512,8 @@ public class RfxmAction extends BaseAction
 				rfxm.setEnableRfyz(0);
 			} else if(rfxmSfxx.get(0).getStatus() != 10) {
 				rfxm.setEnableRfyz(0);
+			} else if(!this.getLoginUser().getLoginId().equals("102023") && !this.getLoginUser().getLoginId().equals("102018")) {
+				rfxm.setEnableRfyz(0);
 			} else {
 				rfxm.setEnableRfyz(1);
 			}
@@ -1206,6 +1208,7 @@ public class RfxmAction extends BaseAction
 		boolean result = true;
 		String message = "";
 		result = rfxm.getEnableRfyz() == 1;
+
 		this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\""+message+"\"}");
 	}