youxiw2000 / trash · Commits

Commit b036989fc922bbecab6ddf11c0546e2b39c1c9d9

Authored by guzijian
2 parents 792fd4be 1318c253
build: skipped

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 12 changed files with 53 additions and 20 deletions
trash-ui/src/views/unit/carInfo/info.vue
  View file @b036989
... ... @@ -9,7 +9,7 @@
9 9 <el-row :gutter="30">
10 10 <el-col :span="7">
11 11 <el-form-item label="所属公司" prop="companyId">
12   - <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany">
  12 + <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany" :disabled="form.id != null">
13 13 <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
14 14 </el-select>
15 15 </el-form-item>
... ...
trash-ui/src/views/unit/disposalSite/info.vue
  View file @b036989
... ... @@ -981,12 +981,14 @@ export default {
981 981 this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
982 982 confirmButtonText: '确定',
983 983 callback: action => {
984   - console.log(this.map)
985   - let path = this.form.electronicFence.split(";");
986   - path.map(item=>{
987   - let arr = item.split(",");
988   - this.polygonArr.push([arr[0],arr[1]]);
989   - });
  984 + if(this.form.electronicFence!=null){
  985 + let path = this.form.electronicFence.split(";");
  986 + path.map(item=>{
  987 + let arr = item.split(",");
  988 + this.polygonArr.push([arr[0],arr[1]]);
  989 + });
  990 + }
  991 +
990 992 }
991 993 });
992 994 },
... ...
trash-ui/src/views/unit/disposalSite/infoEdit.vue
  View file @b036989
... ... @@ -981,12 +981,13 @@ export default {
981 981 this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
982 982 confirmButtonText: '确定',
983 983 callback: action => {
984   - console.log(this.map)
985   - let path = this.form.electronicFence.split(";");
986   - path.map(item=>{
987   - let arr = item.split(",");
988   - this.polygonArr.push([arr[0],arr[1]]);
989   - });
  984 + if(this.form.electronicFence!=null){
  985 + let path = this.form.electronicFence.split(";");
  986 + path.map(item=>{
  987 + let arr = item.split(",");
  988 + this.polygonArr.push([arr[0],arr[1]]);
  989 + });
  990 + }
990 991 }
991 992 });
992 993 },
... ... @@ -1022,6 +1023,13 @@ export default {
1022 1023 /** 提交按钮 */
1023 1024 submitForm() {
1024 1025 this.$refs["form"].validate(valid => {
  1026 + if(this.form.validityBeginDate>this.form.validityEndDate){
  1027 + this.$message({
  1028 + message: '有限期开始时间不能大于有限期结束时间！',
  1029 + type: 'warning'
  1030 + });
  1031 + return false;
  1032 + }
1025 1033 if (valid) {
1026 1034 let formData = new FormData();
1027 1035 let form = this.form;
... ...
trash-ui/src/views/unit/driver/index.vue
  View file @b036989
... ... @@ -193,6 +193,9 @@ export default {
193 193 created() {
194 194 this.getList();
195 195 },
  196 + watch:{
  197 + '$route.query.driverInfoRefresh':'getList'
  198 + },
196 199 methods: {
197 200 /** 查询驾驶员管理列表 */
198 201 getList() {
... ...
trash-ui/src/views/unit/driver/info.vue
  View file @b036989
... ... @@ -48,7 +48,7 @@
48 48 </el-col>
49 49 <el-col :span="7">
50 50 <el-form-item label="所属公司" prop="companyId">
51   - <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;">
  51 + <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" :disabled="form.id != null">
52 52 <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
53 53 </el-select>
54 54 </el-form-item>
... ... @@ -521,6 +521,20 @@ export default {
521 521 });
522 522 return false;
523 523 }
  524 + if(this.form.professionalQualificationBeginDate>this.form.professionalQualificationEndDate){
  525 + this.$message({
  526 + message: '从业资格证有效期终不能小于从业资格证有效期起！',
  527 + type: 'warning'
  528 + });
  529 + return false;
  530 + }
  531 + if(this.form.drivingLicenceBeginDate>this.form.drivingLicenceEndDate){
  532 + this.$message({
  533 + message: '驾驶证有效期终不能小于驾驶证有效期起！',
  534 + type: 'warning'
  535 + });
  536 + return false;
  537 + }
524 538 if (valid) {
525 539 let formData = new FormData();
526 540 let form = this.form;
... ...
trash-unit/src/main/java/com/trash/carInfo/service/impl/CarInfoServiceImpl.java
  View file @b036989
... ... @@ -212,6 +212,8 @@ public class CarInfoServiceImpl implements ICarInfoService
212 212 public String removeSemicolon(String str){
213 213 if (str.startsWith(";"))
214 214 str = str.substring(1);
  215 + if (str.equals(""))
  216 + str = null;
215 217 return str;
216 218 }
217 219 }
... ...
trash-unit/src/main/java/com/trash/disposalSite/service/impl/DisposalSiteServiceImpl.java
  View file @b036989
... ... @@ -199,6 +199,8 @@ public class DisposalSiteServiceImpl implements IDisposalSiteService {
199 199 public String removeSemicolon(String str){
200 200 if (str.startsWith(";"))
201 201 str = str.substring(1);
  202 + if (str.equals(""))
  203 + str = null;
202 204 return str;
203 205 }
204 206 }
... ...
trash-unit/src/main/java/com/trash/driver/service/impl/DriverServiceImpl.java
  View file @b036989
... ... @@ -177,6 +177,8 @@ public class DriverServiceImpl implements IDriverService
177 177 public String removeSemicolon(String str){
178 178 if (str.startsWith(";"))
179 179 str = str.substring(1);
  180 + if (str.equals(""))
  181 + str = null;
180 182 return str;
181 183 }
182 184 }
... ...
trash-unit/src/main/java/com/trash/enterprise/service/impl/TransportationEnterpriseServiceImpl.java
  View file @b036989
... ... @@ -172,6 +172,8 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
172 172 public String removeSemicolon(String str){
173 173 if (str.startsWith(";"))
174 174 str = str.substring(1);
  175 + if (str.equals(""))
  176 + str = null;
175 177 return str;
176 178 }
177 179 }
... ...
trash-unit/src/main/resources/mapper/unit/DisposalSiteMapper.xml
  View file @b036989
... ... @@ -194,7 +194,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
194 194 <update id="updateDisposalSite" parameterType="DisposalSite">
195 195 update disposal_site
196 196 <trim prefix="SET" suffixOverrides=",">
197   - <if test="name != null">name = #{name},</if>
  197 + <if test="name != null">`name` = #{name},</if>
198 198 <if test="certificateNumber != null">certificate_number = #{certificateNumber},</if>
199 199 <if test="address != null">address = #{address},</if>
200 200 <if test="engineeringProperty != null">engineering_property = #{engineeringProperty},</if>
... ... @@ -228,9 +228,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
228 228 <if test="authorization != null">authorization = #{authorization},</if>
229 229 <if test="otherInformation != null">other_information = #{otherInformation},</if>
230 230 <if test="companyIds != null">company_ids = #{companyIds},</if>
231   - <if test="status != null">status = #{status},</if>
232   - <if test="createTime != null">create_time = #{createTime},</if>
233   - <if test="createBy != null">create_by = #{createBy},</if>
  231 + <if test="status != null">`status` = #{status},</if>
234 232 <if test="updateTime != null">update_time = #{updateTime},</if>
235 233 <if test="updateBy != null">update_by = #{updateBy},</if>
236 234 <if test="qrCode != null">qr_code = #{qrCode},</if>
... ...
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
  View file @b036989
... ... @@ -60,7 +60,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
60 60 <if test="safetyManagerName != null and safetyManagerName != ''"> and safety_manager_name like concat('%', #{safetyManagerName}, '%')</if>
61 61 <if test="safetyManagerPhone != null and safetyManagerPhone != ''"> and safety_manager_phone = #{safetyManagerPhone}</if>
62 62 <if test="socialUniformCreditCodeNumber != null and socialUniformCreditCodeNumber != ''"> and social_uniform_credit_code_number = #{socialUniformCreditCodeNumber}</if>
63   - <if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
  63 + <if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative like concat('%',#{legalRepresentative},'%')</if>
64 64 <if test="legalRepresentativePhone != null and legalRepresentativePhone != ''"> and legal_representative_phone = #{legalRepresentativePhone}</if>
65 65 <if test="safetyPeopleName != null and safetyPeopleName != ''"> and safety_people_name like concat('%', #{safetyPeopleName}, '%')</if>
66 66 <if test="transportPermission != null and transportPermission != ''"> and transport_permission = #{transportPermission}</if>
... ...
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
  View file @b036989
... ... @@ -40,7 +40,7 @@ public class Consumer {
40 40 @Autowired
41 41 private IViolationWarningInformationService violationWarningInformationService;
42 42  
43   -// @KafkaListener(topics = "record_process_alarm")
  43 + @KafkaListener(topics = "record_process_alarm")
44 44 public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
45 45 log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
46 46 String id = insertKafkaCompensation(record.value().toString());
... ...