From 71f86a9635d2576bf547f8d2f72b988d4224d29d Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Thu, 16 Mar 2023 16:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarBussStandAttrInfoExecl.java     | 26 ++++++-
 .../SarBussionessStandController.java         |  3 +-
 .../impl/SarBussionessStandServiceImpl.java   | 69 +++++++++----------
 .../impl/PersonCollectEOServiceImpl.java      |  4 +-
 4 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
index 5484e59d..321d8870 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
@@ -85,7 +85,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
     private String xgjh;
 
     //附件
-    private String fbgBuss;
+    private String qtwjbuss;
 
     //标准中文名称
     private String standName;
@@ -147,6 +147,30 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
     //上传时间
     private String xcsjbuss;
 
+    //关联模块-乘用车VPPS编码
+    private String cycvppsbmbuss;
+
+    //关联模块--乘用车vpps中文名称
+    private String cycvppscnbuss;
+
+    //关联模块--卡车VPPS编码
+    private String kcvppsbmbuss;
+
+    //关联模块--卡车vpps中文名称
+    private String kcvppscnbuss;
+
+    //采用标准
+    private String cybz;
+
+    //采标程度
+    private String cycd;
+
+    //引用标准
+    private String yybz;
+
+    //备案日期
+    private String barq;
+
     @TableField(exist = false)
     private Map<String, Object> attrInfoMap = new LinkedHashMap<>();
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index 366a63c2..eedecd3f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -418,8 +418,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         @PostMapping("/importSarBussionessStandFile")
     public ResponseMessage<SarBussionessStand> importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{
 
-                sarBussionessStandEOService.importSarBussionessStandFile(file);
-                return Result.success();
+            return  sarBussionessStandEOService.importSarBussionessStandFile(file);
     }
 
     @ApiOperation(value = "|SarBussionessStand|判断原文译文")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 5228dee2..40652294 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2055,6 +2055,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             //File excelfile = fileList.get(0);
             int excel = 0;
             for (File fileInfo:fileList){
+                String infoJson = "";
                 if (fileInfo.getName().contains(".xls") || fileInfo.getName().contains(".xlsx")) {
                     excel =excel+1;
                  if (excel > 1){
@@ -2112,8 +2113,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 return Result.error("输入的标准名称过长");
                                             }
                                             sarBussStandAttrInfo.setStandName(standName);
-                                        }else {
-                                            return Result.error("标准名称不能为空");
                                         }
 
                                         String standEnName = rowList.get("英文名称");
@@ -2125,8 +2124,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 return Result.error("输入的文本状态过长");
                                             }
                                             sarBussStandAttrInfo.setTextStatusBuss(textStatusBuss);
-                                        }else {
-                                            return Result.error("文本状态不能为空");
                                         }
 
                                         SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd");
@@ -2135,8 +2132,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         String issueTimeStr = sdfs.format(issueTime);
                                         if (StringUtils.isNotBlank(issueTimeStr)){
                                             sarBussStandAttrInfo.setIssueTime(issueTimeStr);
-                                        }else {
-                                            return Result.error("发布日期不能为空");
                                         }
 
 
@@ -2144,8 +2139,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         String putTimeStr = sdfs.format(putTime);
                                         if (StringUtils.isNotBlank(putTimeStr)){
                                             sarBussStandAttrInfo.setPutTime(putTimeStr);
-                                        }else {
-                                            return Result.error("企标实施日期不能为空");
                                         }
 
 
@@ -2158,15 +2151,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 return Result.error("输入的起草部门过长");
                                             }
                                             sarBussStandAttrInfo.setQcdw(qcdw);
-                                        }else {
-                                            return Result.error("起草部门不能为空");
                                         }
 
                                         String fzrqbuss = rowList.get("废止日期");
                                         if (StringUtils.isNotBlank(fzrqbuss)){
                                             sarBussStandAttrInfo.setFzrqbuss(fzrqbuss);
-                                        }else {
-                                            return Result.error("废止日期不能为空");
                                         }
 
 
@@ -2176,8 +2165,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         String fsrqbuss = rowList.get("复审日期");
                                         if (StringUtils.isNotBlank(fsrqbuss)){
                                             sarBussStandAttrInfo.setFsrqbuss(fsrqbuss);
-                                        }else {
-                                            return Result.error("复审日期不能为空");
                                         }
 
 
@@ -2187,20 +2174,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 return Result.error("输入的起草人过长");
                                             }
                                             sarBussStandAttrInfo.setQcrbuss(qcrbuss);
-                                        }else {
-                                            return Result.error("起草人不能为空");
                                         }
 
                                         String bdtqbbhbuss = rowList.get("被代替企标编号");
                                         sarBussStandAttrInfo.setBdtqbbhbuss(bdtqbbhbuss);
 
 ////                                        //采用标准  13
+                                        String cybz = rowList.get("采用标准");
+                                        sarBussStandAttrInfo.setCybz(cybz);
 
                                         String wjscrybuss = rowList.get("文件上传人员");
                                         sarBussStandAttrInfo.setWjscrybuss(wjscrybuss);
 
 ////                                        //采标程度 15
+                                        String cycd = rowList.get("采标程度");
+                                        sarBussStandAttrInfo.setCycd(cycd);
+
 ////                                        //引用标准 16
+                                        String yybz = rowList.get("引用标准");
+                                        sarBussStandAttrInfo.setYybz(yybz);
 
                                         String sycxclass = rowList.get("适用车型");
                                         sarBussStandAttrInfo.setSycxclass(sycxclass);
@@ -2214,8 +2206,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         String xcsjbuss = rowList.get("上传时间");
                                         if (StringUtils.isNotBlank(xcsjbuss)){
                                             sarBussStandAttrInfo.setXcsjbuss(xcsjbuss);
-                                        }else {
-                                            return Result.error("上传时间不能为空");
                                         }
 
 
@@ -2223,13 +2213,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         sarBussStandAttrInfo.setTxlbbuss(txlbbuss);
 
 ////                                        //备案日期 22
-////                                        //关联模块-乘用车VPPS编码 23
-////                                        //关联模块--乘用车vpps中文名称 24
-////                                        //关联模块--卡车VPPS编码 25
-////                                        //关联模块--卡车vpps中文名称 26
+                                        String barq = rowList.get("备案日期");
+                                        sarBussStandAttrInfo.setBarq(barq);
 
-                                        String fbgBuss = rowList.get("附件");
-                                        String[] split = fbgBuss.split(",");
+////                                        //关联模块-乘用车VPPS编码 23
+                                        String cycvppsbmbuss = rowList.get("关联模块-乘用车VPPS编码");
+                                        sarBussStandAttrInfo.setCycvppsbmbuss(cycvppsbmbuss);
+
+////                                        //关联模块--乘用车vpps中文名称 24
+                                        String cycvppscnbuss = rowList.get("关联模块--乘用车vpps中文名称");
+                                        sarBussStandAttrInfo.setCycvppscnbuss(cycvppscnbuss);
+
+////                                        //关联模块--卡车VPPS编码 25
+                                        String kcvppsbmbuss = rowList.get("关联模块--卡车VPPS编码");
+                                        sarBussStandAttrInfo.setKcvppsbmbuss(kcvppsbmbuss);
+
+////                                        //关联模块--卡车vpps中文名称 26
+                                        String kcvppscnbuss = rowList.get("关联模块--卡车vpps中文名称");
+                                        sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
+
+                                        String qtwjbuss = rowList.get("附件");
+                                        String[] split = qtwjbuss.split(",");
                                         String s = "";
                                         if (split.length != 0){
                                             for (int j = 0;j < split.length;j++){
@@ -2238,14 +2242,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 File files = new File(split1[0]+split[j]);
                                                 AttFileVo attFileVo = attFileEOService.saveFileInfo(files);
                                                 if (StringUtils.isNotBlank(attFileVo.getId())){
-                                                    s = "," + attFileVo.getAttId();
+                                                    s += "," + attFileVo.getAttId();
                                                 }else {
                                                     s = attFileVo.getAttId();
                                                 }
-                                                sarBussStandAttrInfo.setFbgBuss(s);
                                             }
-                                        }else {
-                                            sarBussStandAttrInfo.setFbgBuss(StringUtils.join(split));
+                                            sarBussStandAttrInfo.setQtwjbuss(s);
                                         }
 
                                         String standSort = rowList.get("企标类型");
@@ -2254,8 +2256,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 return Result.error("企标类型输入过长");
                                             }
                                             sarBussStandAttrInfo.setStandSort(standSort);
-                                        }else {
-                                            return Result.error("企标类型不能为空");
                                         }
 
                                         String standYear = rowList.get("标准年份");
@@ -2264,8 +2264,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 return Result.error("标准年份输入过长");
                                             }
                                             sarBussStandAttrInfo.setStandYear(standYear);
-                                        }else {
-                                            return Result.error("标准年份不能为空");
                                         }
 
                                         List<SarBussStandAttrInfoExecl> list = new ArrayList<>();
@@ -2279,7 +2277,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         for (int j = 0; j < json.size(); j++) {
                                             jsonObjects = json.getJSONObject(j);
                                         }
-                                        String infoJson = String.valueOf(jsonObjects);
+                                        infoJson = String.valueOf(jsonObjects);
+
                                         //入库
                                         processCreateBuss(infoJson);
                                     }
@@ -2299,15 +2298,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                     FileUnZip.deleteDir(saveDirectory);
                     return Result.error("导入失败");
                 }
-
             }
         }
         }catch (Exception e){
             FileUnZip.deleteDir(saveDirectory);
             return Result.error("导入失败,没有可导入的数据,请检查!");
         }
-
-        return null;
+        return Result.success();
     }
 
     private static List<File> readImpExcelFile(String path) {
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
index 5b021183..99d16a6f 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
@@ -144,9 +144,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
             List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(",")));
             wrapper.in("collect_type",ids);
         }
-        if (validFlag != null && !validFlag.equals("") && validFlag == 0){
+        if (validFlag != null && !validFlag.equals("") && validFlag == 0){//有效
             wrapper.eq("valid_flag",validFlag);
-        }else if (validFlag != null && !validFlag.equals("") && validFlag == 1){
+        }else if (validFlag != null && !validFlag.equals("") && validFlag == 1){//无效
             wrapper.eq("valid_flag",validFlag);
         }
         wrapper.orderByDesc("creation_Time");