瀏覽代碼

修复bug,附件不上传报错问题

Memory_LG 1 年之前
父節點
當前提交
763cbff1ee

+ 22 - 4
data-ui/src/views/data/housingconstruction/gassource/index.vue

@@ -131,8 +131,8 @@
     />
 
     <!-- 添加或修改气源数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="form-style">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+    <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body class="form-style">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="所属企业" prop="enterpriseId">
@@ -291,8 +291,26 @@ export default {
       },
       // 表单校验
       rules: {
-        id: [
-          {required: true, message: "主键id不能为空", trigger: "blur"}
+        enterpriseId: [
+          {required: true, message: "企业不能为空", trigger: "blur"}
+        ],
+        address: [
+          {required: true, message: "来源地不能为空", trigger: "blur"}
+        ],
+        component: [
+          {required: true, message: "燃气成分不能为空", trigger: "blur"}
+        ],
+        joinInstationTime: [
+          {required: true, message: "入站时间不能为空", trigger: "blur"}
+        ],
+        weight: [
+          {required: true, message: "运输体积不能为空", trigger: "blur"}
+        ],
+        carId: [
+          {required: true, message: "运输车辆不能为空", trigger: "blur"}
+        ],
+        deptId: [
+          {required: true, message: "所属部门不能为空", trigger: "blur"}
         ],
       }
     };

+ 0 - 10
src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionGassource.java

@@ -33,16 +33,6 @@ public class CenterdataTHousingconstructionGassource extends BaseBusinessEntity
     private String id;
 
     /**
-     * 创建人名称
-     */
-    private String createName;
-
-    /**
-     * 更新人名称
-     */
-    private String updateName;
-
-    /**
      * 部门id
      */
     private Long deptId;

+ 21 - 14
src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionGassourceServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.housingconstruction.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteConfigService;
@@ -96,12 +97,14 @@ public class CenterdataTHousingconstructionGassourceServiceImpl implements ICent
 
         //附件-文件集合
         String fileUrls = centerdataTHousingconstructionGassource.getFileUrl();
-        attachService.addAttach(fileUrls, gassourceId, "file", null, centerdataTHousingconstructionGassource.getFileName());
-
+        if(!StringUtils.isEmpty(fileUrls)){
+            attachService.addAttach(fileUrls, gassourceId, "file", null, centerdataTHousingconstructionGassource.getFileName());
+        }
         //附件-图片结合
         String attachPaths = centerdataTHousingconstructionGassource.getAttachPaths();
-        attachService.addAttach(attachPaths, gassourceId, "picture", null,"");
-
+        if(!StringUtils.isEmpty(attachPaths)){
+            attachService.addAttach(attachPaths, gassourceId, "picture", null,"");
+        }
         return centerdataTHousingconstructionGassourceMapper.insertCenterdataTHousingconstructionGassource(centerdataTHousingconstructionGassource);
     }
 
@@ -120,20 +123,24 @@ public class CenterdataTHousingconstructionGassourceServiceImpl implements ICent
         attachService.delAttachByBusId(gassourceId);
         //附件-文件集合
         String fileUrls = centerdataTHousingconstructionGassource.getFileUrl();
-        StringBuilder fileUrl = new StringBuilder(fileUrls);
-        if(fileUrls.indexOf("+") > 0){
-            fileUrl = new StringBuilder();
-            String[] split = fileUrls.split(",");
-            for (String s : split) {
-                fileUrl.append(s.substring(0, s.indexOf("+"))).append(",");
+        if(!StringUtils.isEmpty(fileUrls)){
+            //附件-文件集合
+            StringBuilder fileUrl = new StringBuilder(fileUrls);
+            if(fileUrls.indexOf("+") > 0){
+                fileUrl = new StringBuilder();
+                String[] split = fileUrls.split(",");
+                for (String s : split) {
+                    fileUrl.append(s.substring(0, s.indexOf("+"))).append(",");
+                }
+                fileUrl.deleteCharAt(fileUrl.length() -1);
             }
-            fileUrl.deleteCharAt(fileUrl.length() -1);
+            attachService.addAttach(fileUrl.toString(), gassourceId, "file", null, centerdataTHousingconstructionGassource.getFileName());
         }
-        attachService.addAttach(fileUrl.toString(), gassourceId, "file", null, centerdataTHousingconstructionGassource.getFileName());
         //附件-图片结合
         String attachPaths = centerdataTHousingconstructionGassource.getAttachPaths();
-        attachService.addAttach(attachPaths, gassourceId, "picture", null,"");
-
+        if(!StringUtils.isEmpty(attachPaths)){
+            attachService.addAttach(attachPaths, gassourceId, "picture", null,"");
+        }
         return centerdataTHousingconstructionGassourceMapper.updateCenterdataTHousingconstructionGassource(centerdataTHousingconstructionGassource);
     }