From 9f0acaeb06ae88c5a5e41b0ed6fd4b8da8848bc8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 十一月 2024 16:32:11 +0800
Subject: [PATCH] 附件上传文件名称#转换&

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java |   86 ++++++++++++++++++++++++++----------------
 1 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 36aa8e2..b4c8a56 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -129,6 +129,9 @@
     @Resource
     private InsOrderFileMapper insOrderFileMapper;
 
+    @Resource
+    FuSheUtils fuSheUtils;
+
     @Override
     public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
         Map<String, Object> map = new HashMap<>();
@@ -290,13 +293,18 @@
         map.put("head", PrintChina.printChina(InsOrderFile.class));
         Integer insOrderId = insOrderFile.getInsOrderId();
         insOrderFile.setInsOrderId(null);
-        IPage<InsOrderFile> insOrderFileIPage = insOrderFileMapper.getFileList(page, QueryWrappers.queryWrappers(insOrderFile), insOrderId);
+        String sonLaboratory = null;
+        if (ObjectUtils.isNotEmpty(insOrderFile.getSonLaboratory())) {
+            sonLaboratory = insOrderFile.getSonLaboratory();
+            insOrderFile.setSonLaboratory(null);
+        }
+        IPage<InsOrderFile> insOrderFileIPage = insOrderFileMapper.getFileList(page, QueryWrappers.queryWrappers(insOrderFile), insOrderId, sonLaboratory);
         map.put("body", insOrderFileIPage);
         return map;
     }
 
     @Override
-    public int uploadFile(Integer orderId, MultipartFile file) {
+    public int uploadFile(Integer orderId, MultipartFile file, String sonLaboratory) {
         String urlString;
         String pathName;
         String path;
@@ -319,16 +327,39 @@
             if (!realpath.exists()) {
                 realpath.mkdirs();
             }
-            pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+            pathName = file.getOriginalFilename().replace("#","&");
             urlString = realpath + "/" + pathName;
             file.transferTo(new File(urlString));
             insOrderFile.setFileUrl(pathName);
-            return insOrderFileMapper.insert(insOrderFile);
+            if (ObjectUtils.isNotEmpty(sonLaboratory)) {
+                insOrderFile.setSonLaboratory(sonLaboratory);
+                //鍒犻櫎閲嶅鐨勬暟鎹�
+                insOrderFileMapper.delete(Wrappers.<InsOrderFile>lambdaQuery()
+                        .eq(InsOrderFile::getInsOrderId, orderId)
+                        .eq(InsOrderFile::getType, insOrderFile.getType())
+                        .eq(InsOrderFile::getFileName, insOrderFile.getFileName())
+                        .eq(InsOrderFile::getSonLaboratory, insOrderFile.getSonLaboratory())
+                        .eq(InsOrderFile::getFileUrl, insOrderFile.getFileUrl()));
+            } else {
+                //鍒犻櫎閲嶅鐨勬暟鎹�
+                insOrderFileMapper.delete(Wrappers.<InsOrderFile>lambdaQuery()
+                        .eq(InsOrderFile::getInsOrderId, orderId)
+                        .eq(InsOrderFile::getType, insOrderFile.getType())
+                        .eq(InsOrderFile::getFileName, insOrderFile.getFileName())
+                        .isNull(InsOrderFile::getSonLaboratory)
+                        .eq(InsOrderFile::getFileUrl, insOrderFile.getFileUrl()));
+            }
+            insOrderFileMapper.insert(insOrderFile);
+            //濡傛灉鏄緪灏勮瘯楠�(杩戝満/杩滅▼涓婁紶鐨刢sv鏂囦欢)
+            String[] split = filename.split("\\.");
+            if (ObjectUtils.isNotEmpty(sonLaboratory) && (sonLaboratory.equals("杩戝満") || sonLaboratory.equals("杩滃満")) &&
+                    split[split.length - 1].equals("csv")) {
+                fuSheUtils.getFuSheWord(sonLaboratory, insOrderFile);
+            }
         } catch (Exception e) {
-            e.printStackTrace();
             System.err.println("闄勪欢涓婁紶閿欒");
-            return 0;
         }
+        return 0;
     }
 
     @Override
@@ -419,7 +450,8 @@
                 throw new ErrorException("璇ユ牱鍝佺殑妫�楠屼换鍔¤繕娌℃湁缁撴潫璇曢獙鎴栫户缁瘯楠�,鏆傛椂鏃犳硶鍑哄簱!");
             }
         }
-        warehouseService.outWarehouse(sampleCode);
+        boolean a = true;
+        warehouseService.outWarehouse(sampleCode, a);
         return 0;
     }
 
@@ -794,6 +826,8 @@
         insProductResultMapper.delete(Wrappers.<InsProductResult>lambdaQuery()
                 .eq(InsProductResult::getInsProductId, insProductResult.getInsProductId())
                 .eq(InsProductResult::getNum, insProductResult.getNum()));
+        insProductResult.setEquipValue("[{\"v\":\""+insProductResult.getEquipValue()+"\"}]");
+        insProductResult.setEquipName("[{\"v\":\""+insProductResult.getEquipName()+"\"}]");
         insProductResultMapper.insert(insProductResult);
         return 0;
     }
@@ -954,9 +988,9 @@
                     if (insOrder.getFormType().equals("鍘熺悊鏍锋満")) {
                         for (InsSample sample : samples) {
                             //鍑哄簱
-                            try{
-                                outInsOrderState(laboratory,sample.getSampleCode());
-                            }catch (Exception e){
+                            try {
+                                outInsOrderState(laboratory, sample.getSampleCode());
+                            } catch (Exception e) {
 
                             }
                         }
@@ -1078,8 +1112,8 @@
         info.setViewStatus(false);
         info.setJumpPath("b1-inspect-order-plan");
         informationNotificationService.addInformationNotification(info);
-        //todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
-           /* HashMap<String, Object> map = new HashMap<>();
+        // todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
+            /*HashMap<String, Object> map = new HashMap<>();
             String account = userMapper.selectById(userId).getAccount();
             map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
             map.put("toparty", "");//鎺ユ敹閮ㄩ棬id
@@ -1101,29 +1135,15 @@
         insSampleUser.setState(1);
         insSampleUser.setSonLaboratory(submitPlanDto.getLaboratory());
         insSampleUserMapper.insert(insSampleUser);
-        /*//鏍¢獙涓�涓媟esult琛�
-        CompletableFuture.supplyAsync(() -> {
-            List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
-            for (Integer ip : ips) {
-                List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
-                        .eq(InsProductResult::getNum, orderState.getNum())
-                        .eq(InsProductResult::getInsProductId, ip));
-                if (insProductResults.size() > 1) {
-                    for (int i = 1; i < insProductResults.size(); i++) {
-                        insProductResultMapper.deleteById(insProductResults.get(i));
-                    }
-                }
-            }
-            return null;
-        });*/
         /*鐢熸垚鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婂苟涓婁紶鍒伴檮浠朵腑*/
         if (submitPlanDto.getLaboratory().equals("鐢佃矾璇曢獙")) {
-            wordUtils.generateWord(submitPlanDto.getNote(), submitPlanDto.getTerm(), orderState);
-//            try {
-//                wordUtils.generateWord(submitPlanDto.getNote(), submitPlanDto.getTerm(), orderState);
-//            } catch (Exception e) {
-//                throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
-//            }
+            wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+            //todo 鐢佃矾绔欑偣鎶ュ憡 姝e紡搴撻儴缃叉斁寮�
+            /*try {
+                wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+            } catch (Exception e) {
+                throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
+            }*/
         }
         /*// 鍒犻櫎鏁伴噰閲囬泦娆℃暟
         String key = "frequency" + ":" + submitPlanDto.getEntrustCode() + ":*";

--
Gitblit v1.9.3