From 00b9c782322ad546dd6bd37e6ee27f357557a676 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 24 七月 2020 15:46:57 +0800
Subject: [PATCH] #当前本版十分完美、冻结

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index f8f1bdf..e001475 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -15,13 +15,16 @@
 import com.zy.asrs.entity.MatCode;
 import com.zy.asrs.entity.MatCodePrint;
 import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
 import com.zy.common.CodeRes;
+import com.zy.common.config.AdminInterceptor;
 import com.zy.common.utils.BarcodeUtils;
 import com.zy.common.utils.QrCode;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,16 +47,24 @@
         return R.ok(matCodeService.selectById(String.valueOf(id)));
     }
 
+    @RequestMapping(value = "/matCode/auth")
+    @ManagerAuth
+    public R find(@RequestParam("id") String id) {
+        return R.ok(matCodeService.selectById(String.valueOf(id)));
+    }
+
     @RequestMapping(value = "/matCode/list/auth")
     @ManagerAuth
     public R list(@RequestParam(defaultValue = "1")Integer curr,
                   @RequestParam(defaultValue = "10")Integer limit,
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
         excludeTrash(param);
         EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
         convert(param, wrapper);
+        allLike(MatCode.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         else {
             wrapper.orderBy("modi_time", false);
@@ -61,14 +72,15 @@
         return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
-    private void convert(Map<String, Object> map, EntityWrapper wrapper){
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
-            if (entry.getKey().endsWith(">")) {
-                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
-            } else if (entry.getKey().endsWith("<")) {
-                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else {
-                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+                wrapper.like(entry.getKey(), val);
             }
         }
     }
@@ -118,11 +130,7 @@
         List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
         List<MatCodeExcel> excels = new ArrayList<>();
         for (MatCode matCode : list) {
-            MatCodeExcel excel = new MatCodeExcel();
-            excel.setMatNo(matCode.getMatNo());
-            excel.setBarcode(matCode.getBarcode());
-            excel.setMatName(matCode.getMatName());
-            excel.setStr1(matCode.getStr1());
+            MatCodeExcel excel = VersionUtils.getExcel(matCode);
             excels.add(excel);
             if (rowCount != null && excels.size() >= rowCount){
                 break;
@@ -141,6 +149,7 @@
     // 瀵煎叆
     @RequestMapping(value = "/matCode/import/auth")
     @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+    @Transactional
     public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
         MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
         EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
@@ -148,7 +157,7 @@
     }
 
     // 鎵撳嵃
-    @RequestMapping(value = "/macCode/print/auth")
+    @RequestMapping(value = "/matCode/print/auth")
     @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
     public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
         if(Cools.isEmpty(param)) {
@@ -174,6 +183,7 @@
     public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                         , @RequestParam String param
                         , HttpServletResponse response) throws Exception {
+        AdminInterceptor.cors(response);
         if (Cools.isEmpty(param)){
             return R.parse(BaseRes.EMPTY);
         }

--
Gitblit v1.9.1