From 67cfa2b1d60fb6b8a5ca36db0b1d06b9a1a1fe66 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Sat, 24 Jul 2021 18:40:40 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81Excel=E6=89=B9=E9=87=8F=E5=BF=AB?= =?UTF-8?q?=E9=80=92=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8select2?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=8C=E9=87=8D=E7=BD=AE=E5=80=BC?= =?UTF-8?q?=E4=B8=8D=E6=94=B9=E5=8F=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExpImportQueryController.java | 18 ++++++++---------- .../templates/bps/expImportQuery/detail.html | 4 ++-- .../bps/expImportQuery/expImportQuery.html | 4 ++-- .../templates/bps/expressInfo/expressInfo.html | 4 ++-- .../bps/expsubspushresp/expsubspushresp.html | 11 ++++++++--- .../templates/bps/subscribe/subscribe.html | 9 +++++++-- ruoyi-admin/src/main/resources/application.yml | 2 +- 7 files changed, 30 insertions(+), 22 deletions(-) diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java index 0ae4890ce..84d2a6f6c 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java @@ -18,6 +18,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -85,7 +86,7 @@ public class ExpImportQueryController extends BaseController /** * 导出Excel批量快递查询列表 */ - @RequiresPermissions("bps:expImportQuery:export") + @RequiresPermissions("bps:expressInfo:export") @Log(title = "详细快递信息导出", businessType = BusinessType.EXPORT) @PostMapping("/exportDetail") @ResponseBody @@ -160,9 +161,6 @@ public class ExpImportQueryController extends BaseController @GetMapping("/detail/{sid}") public String detail(@PathVariable("sid") Long sid, ModelMap mmap) { - /*ExpImportQuery expImportQuery = expImportQueryService.selectExpImportQueryById(sid); - mmap.put("expImportQuery", expImportQuery);*/ - String queryId = expImportQueryService.selectExpImportQueryById(sid).getQueryId(); ExpressInfo expressInfo= new ExpressInfo(); expressInfo.setQueryId(queryId); @@ -190,12 +188,12 @@ public class ExpImportQueryController extends BaseController ExpImportQuery expImportQuery=new ExpImportQuery(); try{ for( ExpressInfo expressInfo:expressInfoList){ - ExpressInfo ei= expressInfoService.SelectExpressInfo(expressInfo); - ei.setQueryId(queryId); - ei.setQueryUserName(ShiroUtils.getSysUser().getUserName()); - ei.setQueryType("excel"); - ei.setQueryTime(queryTime); - expressInfoService.insertExpressInfo(ei); + ExpressInfo ei= expressInfoService.SelectExpressInfo(expressInfo); + ei.setQueryId(queryId); + ei.setQueryUserName(ShiroUtils.getSysUser().getUserName()); + ei.setQueryType("excel"); + ei.setQueryTime(queryTime); + expressInfoService.insertExpressInfo(ei); } expImportQuery.setQueryTime(queryTime); diff --git a/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html b/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html index 848535ec6..d0b2a4496 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html @@ -20,7 +20,7 @@
- + 导出
@@ -41,7 +41,7 @@ $(function() { var options = { url: prefix + "/localList", - exportUrl: prefix + "/exportDetail", + exportUrl: ctx+ "bps/expImportQuery/exportDetail", modalName: "快递信息", columns: [{ checkbox: true diff --git a/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html b/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html index c489c82a5..c8f1778cc 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html @@ -42,7 +42,7 @@ 导入 - +
diff --git a/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html index 5b465cb04..04a3a4e21 100644 --- a/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html +++ b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html @@ -45,12 +45,12 @@ 删除 --> - +
diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html index a3c79046e..0b8c2dc29 100644 --- a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html @@ -13,7 +13,7 @@
@@ -220,6 +220,11 @@ }; $.table.init(options); }); + + function reset(){ + $('.form-control').val(null).trigger('change'); + $.form.reset(); + } \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html index 1520a1125..6c20e4111 100644 --- a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html +++ b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html @@ -14,7 +14,7 @@