运输公司新增公司头像logo字段

2c
1 parent 4ea8b8de
Showing 6 changed files with 118 additions and 5 deletions
trash-ui/src/views/unit/enterprise/info.vue
trash-unit/src/main/java/com/trash/enterprise/controller/TransportationEnterpriseController.java
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
trash-unit/src/main/java/com/trash/enterprise/service/ITransportationEnterpriseService.java
trash-unit/src/main/java/com/trash/enterprise/service/impl/TransportationEnterpriseServiceImpl.java
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
@@ -321,6 +321,39 @@
           </div>
         </el-col>
       </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            公司头像或LOGO
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg"
+              :on-change="fileChange5"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="companyLogo">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in companyLogo">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="companyLogo.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
       <!--        <el-form-item label="" prop="environmentalApproval">-->
       <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
       <!--        </el-form-item>-->
@@ -490,6 +523,8 @@ export default {
       safetyCertificate:[],
       // 停车场全景图
       carParkPanorama:[],
+      //公司logo,公司头像
+      companyLogo:[],
       enterpriseList:[],
       // 地图
       map: null,
@@ -607,6 +642,7 @@ export default {
       this.safetyOfficerQualificationCertificate = [];
       this.safetyCertificate = [];
       this.carParkPanorama = [];
+      this.companyLogo = [];
     },
     initData(){
       this.reset();
@@ -650,6 +686,13 @@ export default {
               this.carParkPanorama.push({name:name,url:item})
             })
           }
+          if(this.form.companyLogo!=null&&this.form.companyLogo!==""){
+            let safetyAssessmentReport = this.form.companyLogo.split(";");
+            safetyAssessmentReport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.companyLogo.push({name:name,url:item})
+            })
+          }
         });
       }
     },
@@ -705,6 +748,7 @@ export default {
           form.safetyOfficerQualificationCertificate = null;
           form.safetyCertificate = null;
           form.carParkPanorama = null;
+          form.companyLogo = null;
           form.companyType = "1";
           this.transportPermission.forEach(item => {
@@ -748,6 +792,14 @@ export default {
               form.carParkPanorama = form.carParkPanorama!==null?form.carParkPanorama+";"+item.url:item.url;
             }
           })
+          this.companyLogo.forEach(item => {
+            if (item.raw != null) {
+              formData.append('companyLogoFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.companyLogo = form.companyLogo!==null?form.companyLogo+";"+item.url:item.url;
+            }
+          })
           for (let key in form) {
             formData.append(key, form[key] == null ? "" : form[key])
           }
@@ -999,6 +1051,36 @@ export default {
         fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
+    fileChange5(file, fileList) {
+      if(fileList.length>1){
+        this.$message({
+          message: '只能上传一张图片！',
+          type: 'warning'
+        });
+        return false;
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.companyLogo = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
   }
 };
 </script>
@@ -74,8 +74,9 @@ public class TransportationEnterpriseController extends BaseController
                           @RequestParam(value = "safetyOfficerQualificationCertificateFiles") MultipartFile[] safetyOfficerQualificationCertificateFiles,
                           @RequestParam(value = "safetyCertificateFiles") MultipartFile[] safetyCertificateFiles,
                           @RequestParam(value = "carParkPanoramaFiles") MultipartFile[] carParkPanoramaFiles,
+                          @RequestParam(value = "companyLogoFiles") MultipartFile[] companyLogoFiles,
                           TransportationEnterprise transportationEnterprise) throws IOException {
-        return toAjax(transportationEnterpriseService.insertTransportationEnterprise(transportPermissionFiles, enterpriseBusinessLicenseFiles, safetyOfficerQualificationCertificateFiles, safetyCertificateFiles, carParkPanoramaFiles, transportationEnterprise));
+        return toAjax(transportationEnterpriseService.insertTransportationEnterprise(transportPermissionFiles, enterpriseBusinessLicenseFiles, safetyOfficerQualificationCertificateFiles, safetyCertificateFiles, carParkPanoramaFiles,companyLogoFiles, transportationEnterprise));
     }
     /**
@@ -89,8 +90,9 @@ public class TransportationEnterpriseController extends BaseController
                            @RequestParam(value = "safetyOfficerQualificationCertificateFiles") MultipartFile[] safetyOfficerQualificationCertificateFiles,
                            @RequestParam(value = "safetyCertificateFiles") MultipartFile[] safetyCertificateFiles,
                            @RequestParam(value = "carParkPanoramaFiles") MultipartFile[] carParkPanoramaFiles,
+                           @RequestParam(value = "companyLogoFiles") MultipartFile[] companyLogoFiles,
                            TransportationEnterprise transportationEnterprise) throws IOException {
-        return toAjax(transportationEnterpriseService.updateTransportationEnterprise(transportPermissionFiles, enterpriseBusinessLicenseFiles, safetyOfficerQualificationCertificateFiles, safetyCertificateFiles, carParkPanoramaFiles, transportationEnterprise));
+        return toAjax(transportationEnterpriseService.updateTransportationEnterprise(transportPermissionFiles, enterpriseBusinessLicenseFiles, safetyOfficerQualificationCertificateFiles, safetyCertificateFiles, carParkPanoramaFiles,companyLogoFiles, transportationEnterprise));
     }
     /**
@@ -133,6 +133,21 @@ public class TransportationEnterprise extends BaseEntity
     @Excel(name = "公司报价")
     private String offer;
+    /**
+     * 公司logo，公司头像
+     */
+    private String companyLogo;
+
+
+    public String getCompanyLogo() {
+        return companyLogo;
+    }
+
+
+    public void setCompanyLogo(String companyLogo) {
+        this.companyLogo = companyLogo;
+    }
+
     public String getOffer() {
         return offer;
     }
@@ -45,6 +45,7 @@ public interface ITransportationEnterpriseService
                                        MultipartFile[] safetyOfficerQualificationCertificateFiles,
                                        MultipartFile[] safetyCertificateFiles,
                                        MultipartFile[] carParkPanoramaFiles,
+                                       MultipartFile[] companyLogoFiles,
                                        TransportationEnterprise transportationEnterprise) throws IOException;
     /**
@@ -63,6 +64,7 @@ public interface ITransportationEnterpriseService
                                        MultipartFile[] safetyOfficerQualificationCertificateFiles,
                                        MultipartFile[] safetyCertificateFiles,
                                        MultipartFile[] carParkPanoramaFiles,
+                                       MultipartFile[] companyLogoFiles,
                                        TransportationEnterprise transportationEnterprise) throws IOException;
     /**
@@ -63,7 +63,7 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
      * @return 结果
      */
     @Override
-    public int insertTransportationEnterprise(MultipartFile[] transportPermissionFiles, MultipartFile[] enterpriseBusinessLicenseFiles, MultipartFile[] safetyOfficerQualificationCertificateFiles, MultipartFile[] safetyCertificateFiles, MultipartFile[] carParkPanoramaFiles, TransportationEnterprise transportationEnterprise) throws IOException {
+    public int insertTransportationEnterprise(MultipartFile[] transportPermissionFiles, MultipartFile[] enterpriseBusinessLicenseFiles, MultipartFile[] safetyOfficerQualificationCertificateFiles, MultipartFile[] safetyCertificateFiles, MultipartFile[] carParkPanoramaFiles, MultipartFile[] companyLogoFiles, TransportationEnterprise transportationEnterprise) throws IOException {
         transportationEnterprise.setCreateTime(DateUtils.getNowDate());
         transportationEnterprise.setCreateBy(SecurityUtils.getUsername());
         transportationEnterprise.setStatus(0);
@@ -83,12 +83,16 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         for (MultipartFile file : carParkPanoramaFiles) {
             transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama()!=null?transportationEnterprise.getCarParkPanorama()+";"+upload(file):upload(file));
         }
+        for (MultipartFile file : companyLogoFiles) {
+            transportationEnterprise.setCompanyLogo(transportationEnterprise.getCompanyLogo()!=null?transportationEnterprise.getCompanyLogo()+";"+upload(file):upload(file));
+        }
         //去掉第一个分号,如果有的话
         transportationEnterprise.setTransportPermission(removeSemicolon(transportationEnterprise.getTransportPermission()));
         transportationEnterprise.setEnterpriseBusinessLicense(removeSemicolon(transportationEnterprise.getEnterpriseBusinessLicense()));
         transportationEnterprise.setSafetyOfficerQualificationCertificate(removeSemicolon(transportationEnterprise.getSafetyOfficerQualificationCertificate()));
         transportationEnterprise.setSafetyCertificate(removeSemicolon(transportationEnterprise.getSafetyCertificate()));
         transportationEnterprise.setCarParkPanorama(removeSemicolon(transportationEnterprise.getCarParkPanorama()));
+        transportationEnterprise.setCompanyLogo(removeSemicolon(transportationEnterprise.getCompanyLogo()));
         return transportationEnterpriseMapper.insertTransportationEnterprise(transportationEnterprise);
     }
@@ -104,7 +108,7 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
      * @return 结果
      */
     @Override
-    public int updateTransportationEnterprise(MultipartFile[] transportPermissionFiles, MultipartFile[] enterpriseBusinessLicenseFiles, MultipartFile[] safetyOfficerQualificationCertificateFiles, MultipartFile[] safetyCertificateFiles, MultipartFile[] carParkPanoramaFiles, TransportationEnterprise transportationEnterprise) throws IOException {
+    public int updateTransportationEnterprise(MultipartFile[] transportPermissionFiles, MultipartFile[] enterpriseBusinessLicenseFiles, MultipartFile[] safetyOfficerQualificationCertificateFiles, MultipartFile[] safetyCertificateFiles, MultipartFile[] carParkPanoramaFiles, MultipartFile[] companyLogoFiles, TransportationEnterprise transportationEnterprise) throws IOException {
         transportationEnterprise.setUpdateTime(DateUtils.getNowDate());
         transportationEnterprise.setUpdateBy(SecurityUtils.getUsername());
         for (MultipartFile file : transportPermissionFiles) {
@@ -122,11 +126,15 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         for (MultipartFile file : carParkPanoramaFiles) {
             transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama()!=null?transportationEnterprise.getCarParkPanorama()+";"+upload(file):upload(file));
         }
+        for (MultipartFile file : companyLogoFiles) {
+            transportationEnterprise.setCompanyLogo(transportationEnterprise.getCompanyLogo()!=null?transportationEnterprise.getCompanyLogo()+";"+upload(file):upload(file));
+        }
         transportationEnterprise.setTransportPermission(removeSemicolon(transportationEnterprise.getTransportPermission()));
         transportationEnterprise.setEnterpriseBusinessLicense(removeSemicolon(transportationEnterprise.getEnterpriseBusinessLicense()));
         transportationEnterprise.setSafetyOfficerQualificationCertificate(removeSemicolon(transportationEnterprise.getSafetyOfficerQualificationCertificate()));
         transportationEnterprise.setSafetyCertificate(removeSemicolon(transportationEnterprise.getSafetyCertificate()));
         transportationEnterprise.setCarParkPanorama(removeSemicolon(transportationEnterprise.getCarParkPanorama()));
+        transportationEnterprise.setCompanyLogo(removeSemicolon(transportationEnterprise.getCompanyLogo()));
         return transportationEnterpriseMapper.updateTransportationEnterprise(transportationEnterprise);
     }
@@ -41,10 +41,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="qrCode"    column="qr_code"    />
         <result property="servicePhone"   column="service_phone"    />
         <result property="offer"   column="offer"    />
+        <result property="companyLogo"   column="company_logo"    />
     </resultMap>
     <sql id="selectTransportationEnterpriseVo">
-        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone,office_address_gps,offer from transportation_enterprise te
+        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone,office_address_gps,offer,company_logo from transportation_enterprise te
     </sql>
     <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
@@ -124,6 +125,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="servicePhone != null">service_phone,</if>
             <if test="officeAddressGps != null">office_address_gps,</if>
             <if test="offer != null">offer,</if>
+            <if test="companyLogo != null">company_logo,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -161,6 +163,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="servicePhone != null">#{servicePhone},</if>
             <if test="officeAddressGps != null">#{officeAddressGps},</if>
             <if test="offer != null">#{offer},</if>
+            <if test="companyLogo != null">#{companyLogo},</if>
          </trim>
     </insert>
@@ -202,6 +205,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="servicePhone != null">service_phone = #{servicePhone},</if>
             <if test="officeAddressGps != null">office_address_gps = #{officeAddressGps},</if>
             <if test="offer != null">offer = #{offer},</if>
+            <if test="companyLogo != null">company_logo = #{companyLogo},</if>
         </trim>
         where id = #{id}
     </update>