youxiw2000 / trash · Commits

Commit 63890800b94203596db184481885a4e538836aff

Authored by 2c
1 parent 0ca2eb74
build: skipped

运输公司去掉营运单位，新增服务电话字段

Inline Side-by-side
Showing 3 changed files with 29 additions and 16 deletions
trash-ui/src/views/unit/enterprise/info.vue
  View file @6389080
... ... @@ -113,10 +113,8 @@
113 113 </el-form-item>
114 114 </el-col>
115 115 <el-col :span="7">
116   - <el-form-item label="经营单位" prop="parentId">
117   - <el-select v-model="form.parentId" placeholder="请选择经营单位" clearable style="width: 100%;">
118   - <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
119   - </el-select>
  116 + <el-form-item label="服务电话" prop="servicePhone">
  117 + <el-input v-model="form.servicePhone" placeholder="请输入企业服务电话" :maxlength="11" show-word-limit/>
120 118 </el-form-item>
121 119 </el-col>
122 120 <el-col :span="7">
... ... @@ -417,6 +415,14 @@ export default {
417 415 safetyPeopleName: [
418 416 {required: true, message: "请输入安全管理人员", trigger: "blur"}
419 417 ],
  418 + servicePhone: [
  419 + {required: true, message: "请输入企业服务手机号码", trigger: "blur"},
  420 + {
  421 + pattern: /^1(3|4|5|7|8|9)\d{9}$/,
  422 + message: '手机号格式错误',
  423 + trigger: 'change'
  424 + }
  425 + ],
420 426 },
421 427 areas:[],
422 428 // 企业道路运输经营许可证
... ...
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
  View file @6389080
... ... @@ -85,31 +85,24 @@ public class TransportationEnterprise extends BaseEntity
85 85 private String legalRepresentativePhone;
86 86  
87 87 /** 安全管理人员 */
88   - @Excel(name = "安全管理人员")
89 88 private String safetyPeopleName;
90 89  
91 90 /** 企业道路运输经营许可证 */
92   - @Excel(name = "企业道路运输经营许可证")
93 91 private String transportPermission;
94 92  
95 93 /** 企业营业执照 */
96   - @Excel(name = "企业营业执照")
97 94 private String enterpriseBusinessLicense;
98 95  
99 96 /** 安全员考核合格证明 */
100   - @Excel(name = "安全员考核合格证明")
101 97 private String safetyOfficerQualificationCertificate;
102 98  
103 99 /** 企业负责人安全考核证 */
104   - @Excel(name = "企业负责人安全考核证")
105 100 private String safetyCertificate;
106 101  
107 102 /** 停车场全景图 */
108   - @Excel(name = "停车场全景图")
109 103 private String carParkPanorama;
110 104  
111 105 /** 经营单位 */
112   - @Excel(name = "经营单位")
113 106 private String businessUnit;
114 107  
115 108 /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
... ... @@ -117,7 +110,6 @@ public class TransportationEnterprise extends BaseEntity
117 110 private Integer status;
118 111  
119 112 /** 父公司id */
120   - @Excel(name = "父公司id")
121 113 private Long parentId;
122 114  
123 115 /** 公司类型（0经营单位，1运输公司） */
... ... @@ -125,14 +117,24 @@ public class TransportationEnterprise extends BaseEntity
125 117 private Integer companyType;
126 118  
127 119 /** 信用状态 */
128   - @Excel(name = "信用状态")
129 120 private String creditStatus;
130 121  
131 122 /** 二维码 */
132   - @Excel(name = "二维码")
133 123 private String qrCode;
134 124  
135   - public void setId(Long id)
  125 + /** 企业服务电话 */
  126 + @Excel(name = "公司类型")
  127 + private String servicePhone;
  128 +
  129 + public String getServicePhone() {
  130 + return servicePhone;
  131 + }
  132 +
  133 + public void setServicePhone(String servicePhone) {
  134 + this.servicePhone = servicePhone;
  135 + }
  136 +
  137 + public void setId(Long id)
136 138 {
137 139 this.id = id;
138 140 }
... ...
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
  View file @6389080
... ... @@ -38,10 +38,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
38 38 <result property="companyType" column="company_type" />
39 39 <result property="creditStatus" column="credit_status" />
40 40 <result property="qrCode" column="qr_code" />
  41 + <result property="servicePhone" column="service_phone" />
41 42 </resultMap>
42 43  
43 44 <sql id="selectTransportationEnterpriseVo">
44   - 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 from transportation_enterprise te
  45 + 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 from transportation_enterprise te
45 46 </sql>
46 47  
47 48 <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
... ... @@ -74,6 +75,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
74 75 <if test="companyType != null "> and company_type = #{companyType}</if>
75 76 <if test="creditStatus != null and creditStatus != ''"> and credit_status = #{creditStatus}</if>
76 77 <if test="qrCode != null and qrCode != ''"> and qr_code = #{qrCode}</if>
  78 + <if test="servicePhone != null and servicePhone != ''"> and service_phone = #{servicePhone}</if>
77 79 </where>
78 80 </select>
79 81  
... ... @@ -117,6 +119,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
117 119 <if test="companyType != null">company_type,</if>
118 120 <if test="creditStatus != null">credit_status,</if>
119 121 <if test="qrCode != null">qr_code,</if>
  122 + <if test="servicePhone != null">service_phone,</if>
120 123 </trim>
121 124 <trim prefix="values (" suffix=")" suffixOverrides=",">
122 125 <if test="name != null">#{name},</if>
... ... @@ -151,6 +154,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
151 154 <if test="companyType != null">#{companyType},</if>
152 155 <if test="creditStatus != null">#{creditStatus},</if>
153 156 <if test="qrCode != null">#{qrCode},</if>
  157 + <if test="servicePhone != null">#{servicePhone},</if>
154 158 </trim>
155 159 </insert>
156 160  
... ... @@ -189,6 +193,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
189 193 <if test="companyType != null">company_type = #{companyType},</if>
190 194 <if test="creditStatus != null">credit_status = #{creditStatus},</if>
191 195 <if test="qrCode != null">qr_code = #{qrCode},</if>
  196 + <if test="servicePhone != null">service_phone = #{servicePhone},</if>
192 197 </trim>
193 198 where id = #{id}
194 199 </update>
... ...