From 45a95e86d024ecac9386e297de020b4bf9411d2e Mon Sep 17 00:00:00 2001 From: xuefeilong <15138742644@163.com> Date: Sat, 25 May 2024 14:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=B2=A1=E5=A1=AB=E9=87=91=E9=A2=9Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxgl/xmkpgl/kpsh/KpshController.java | 2 + .../xxgl/xmkpgl/kpsq/KpsqController.java | 5 + .../xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java | 14 ++- .../mapper/mysql/xxgl/KpsqMapper.xml | 9 +- .../static/commons/common/sctTools.js | 4 +- .../layuiadmin/layui/lay/modules/layer.js | 3 +- .../resources/static/zzsxt/dbsx/index_gzl.js | 2 + .../static/zzsxt/xxgl/xmkpgl/kpsh/index.js | 79 +++++++++++----- .../static/zzsxt/xxgl/xmkpgl/kpsq/index.js | 94 ++++++++++++++----- .../zzsxt/xxgl/xmkpgl/kpsq/index_add.js | 23 +++-- .../zzsxt/xxgl/xmkpgl/kpsq/index_open.js | 12 +++ .../zzsxt/xxgl/xmkpgl/kpsq/index.html | 1 + .../zzsxt/xxgl/xmkpgl/kpsq/index_bw.html | 57 +++++++++++ 13 files changed, 238 insertions(+), 67 deletions(-) create mode 100644 src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_bw.html diff --git a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsh/KpshController.java b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsh/KpshController.java index d239f6f..8503be3 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsh/KpshController.java +++ b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsh/KpshController.java @@ -56,6 +56,8 @@ public class KpshController extends BaseController{ public String kpshIndexOpen(){ return "zzsxt/xxgl/xmkpgl/kpsh/index_open"; } + + /** *@Author rdd diff --git a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java index 0dc4bc9..9bfe7d0 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java +++ b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java @@ -120,6 +120,11 @@ public class KpsqController extends BaseController{ return "zzsxt/xxgl/xmkpgl/kpsq/index_open"; } + @RequestMapping(value="/kpsq/index_bw",method = RequestMethod.GET) + public String kpsqIndexBw(){ + return "zzsxt/xxgl/xmkpgl/kpsq/index_bw"; + } + /** *@Author zhoushaozhi *@Description 待办任务查看 diff --git a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java index 940e8f8..c7587d1 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java +++ b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java @@ -198,7 +198,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { // userMap.put("url","https://f7-demo.jchl.com/taxshare/api/xxApi/djts"); // asyncInvoicing(userMap); } - + userMap.put("msg",results); result = kpsqMapper.insertZZSGL_XX_KPSQ(CommonUtil.replaceLDhOfMap(userMap)); return result>0?results:""; @@ -503,7 +503,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { resJSON.put("kjUrl", BasicConstant.DJTS_URL); resJSON.put("appkey",MapUtil.getStr(maps.get(0),"APPID")); resJSON.put("appSecret", MapUtil.getStr(maps.get(0),"APPSECRET")); - resJSON.put("body", jsonObject.toJSONString(1)); + resJSON.put("body", jsonObject); //获取token cn.hutool.json.JSONObject tokenJsonObReq = new cn.hutool.json.JSONObject(); @@ -1449,7 +1449,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { resJSON.put("tsUrl", BasicConstant.DJTS_URL); resJSON.put("appkey", JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).getStr("appKey")); resJSON.put("appSecret", JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).getStr("appSecret")); - resJSON.put("body", JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).toString()); + resJSON.put("body", jsonObject); StaticLog.info("appkey:{}",JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).getStr("appKey")); @@ -1466,10 +1466,14 @@ public class BoKpsqServiceImpl implements IBoKpsqService { .body(jsonObject) .execute().body(); resJSON.put("result",reslut); - res.append(resJSON); StaticLog.info("新增异步开票申请和明细信息成功:{}",reslut); + Map kpsqMap = new HashMap<>(); + kpsqMap.put("djbh",xxKpsqDO.getSqid()); + kpsqMap.put("msg",resJSON.toString()); + kpsqMapper.updataZZSGL_XX_KPSQ(kpsqMap); + res.append(resJSON.toString()); } - + return res.toString(); } diff --git a/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml b/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml index 9b672d1..0e40743 100644 --- a/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml +++ b/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml @@ -379,7 +379,7 @@ (SQID,ZZJG_DM, XMID, XMZPID, HTID, FPLXDM, SQKPJE, SQKPSE, FBFPJE, FBFPSE, FBFPKCJE, SQZT, XMKPBZ, XMSQHBBZ, QTKPSQLX, LSSJ, SQRYDM, SQSJ, HBBZ, BHBSQID, KPZT, SQKPHSJE, - GCJSD, FPSX, BZ, USERID,khmc,khsh,qylxr,qylxdh,khhzh,is_change_title, KPSX,DJLX,gsdm,yhdm,sjly,sjlx,ssyt + GCJSD, FPSX, BZ, USERID,khmc,khsh,qylxr,qylxdh,khhzh,is_change_title, KPSX,DJLX,gsdm,yhdm,sjly,sjlx,ssyt,msg ,YSQID @@ -431,7 +431,7 @@ #{SQZT}, #{XMKPBZ}, #{XMSQHBBZ}, #{QTKPSQLX}, #{LSSJ}, #{CZRY_DM}, NOW(), #{HBBZ}, #{BHBSQID}, #{KPZT}, #{SQKPHSJE}, - #{GCJSD}, #{FPSX} ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm},#{sjly},#{sjlx},#{ssyt} + #{GCJSD}, #{FPSX} ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm},#{sjly},#{sjlx},#{ssyt},#{msg} ,#{YSQID} @@ -515,7 +515,7 @@ + + + + + + +