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

guzijian
2 parents 792fd4be 1318c253
Showing 12 changed files with 53 additions and 20 deletions
trash-ui/src/views/unit/carInfo/info.vue
trash-ui/src/views/unit/disposalSite/info.vue
trash-ui/src/views/unit/disposalSite/infoEdit.vue
trash-ui/src/views/unit/driver/index.vue
trash-ui/src/views/unit/driver/info.vue
trash-unit/src/main/java/com/trash/carInfo/service/impl/CarInfoServiceImpl.java
trash-unit/src/main/java/com/trash/disposalSite/service/impl/DisposalSiteServiceImpl.java
trash-unit/src/main/java/com/trash/driver/service/impl/DriverServiceImpl.java
trash-unit/src/main/java/com/trash/enterprise/service/impl/TransportationEnterpriseServiceImpl.java
trash-unit/src/main/resources/mapper/unit/DisposalSiteMapper.xml
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
@@ -9,7 +9,7 @@
       <el-row :gutter="30">
         <el-col :span="7">
           <el-form-item label="所属公司" prop="companyId">
-            <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany">
+            <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany" :disabled="form.id != null">
               <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
             </el-select>
           </el-form-item>
@@ -981,12 +981,14 @@ export default {
       this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
         confirmButtonText: '确定',
         callback: action => {
-          console.log(this.map)
-          let path = this.form.electronicFence.split(";");
-          path.map(item=>{
-            let arr = item.split(",");
-            this.polygonArr.push([arr[0],arr[1]]);
-          });
+          if(this.form.electronicFence!=null){
+            let path = this.form.electronicFence.split(";");
+            path.map(item=>{
+              let arr = item.split(",");
+              this.polygonArr.push([arr[0],arr[1]]);
+            });
+          }
+
         }
       });
     },
@@ -981,12 +981,13 @@ export default {
       this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
         confirmButtonText: '确定',
         callback: action => {
-          console.log(this.map)
-          let path = this.form.electronicFence.split(";");
-          path.map(item=>{
-            let arr = item.split(",");
-            this.polygonArr.push([arr[0],arr[1]]);
-          });
+          if(this.form.electronicFence!=null){
+            let path = this.form.electronicFence.split(";");
+            path.map(item=>{
+              let arr = item.split(",");
+              this.polygonArr.push([arr[0],arr[1]]);
+            });
+          }
         }
       });
     },
@@ -1022,6 +1023,13 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        if(this.form.validityBeginDate>this.form.validityEndDate){
+          this.$message({
+            message: '有限期开始时间不能大于有限期结束时间！',
+            type: 'warning'
+          });
+          return false;
+        }
         if (valid) {
           let formData = new FormData();
           let form = this.form;
@@ -193,6 +193,9 @@ export default {
   created() {
     this.getList();
   },
+  watch:{
+    '$route.query.driverInfoRefresh':'getList'
+  },
   methods: {
     /** 查询驾驶员管理列表 */
     getList() {
@@ -48,7 +48,7 @@
         </el-col>
         <el-col :span="7">
           <el-form-item label="所属公司" prop="companyId">
-            <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;">
+            <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" :disabled="form.id != null">
               <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
             </el-select>
           </el-form-item>
@@ -521,6 +521,20 @@ export default {
           });
           return false;
         }
+        if(this.form.professionalQualificationBeginDate>this.form.professionalQualificationEndDate){
+          this.$message({
+            message: '从业资格证有效期终不能小于从业资格证有效期起！',
+            type: 'warning'
+          });
+          return false;
+        }
+        if(this.form.drivingLicenceBeginDate>this.form.drivingLicenceEndDate){
+          this.$message({
+            message: '驾驶证有效期终不能小于驾驶证有效期起！',
+            type: 'warning'
+          });
+          return false;
+        }
         if (valid) {
           let formData = new FormData();
           let form = this.form;
@@ -212,6 +212,8 @@ public class CarInfoServiceImpl implements ICarInfoService
     public String removeSemicolon(String str){
         if (str.startsWith(";"))
             str = str.substring(1);
+        if (str.equals(""))
+            str = null;
         return str;
     }
 }
@@ -199,6 +199,8 @@ public class DisposalSiteServiceImpl implements IDisposalSiteService {
     public String removeSemicolon(String str){
         if (str.startsWith(";"))
             str = str.substring(1);
+        if (str.equals(""))
+            str = null;
         return str;
     }
 }
@@ -177,6 +177,8 @@ public class DriverServiceImpl implements IDriverService
     public String removeSemicolon(String str){
         if (str.startsWith(";"))
             str = str.substring(1);
+        if (str.equals(""))
+            str = null;
         return str;
     }
 }
@@ -172,6 +172,8 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
     public String removeSemicolon(String str){
         if (str.startsWith(";"))
             str = str.substring(1);
+        if (str.equals(""))
+            str = null;
         return str;
     }
 }
@@ -194,7 +194,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <update id="updateDisposalSite" parameterType="DisposalSite">
         update disposal_site
         <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
+            <if test="name != null">`name` = #{name},</if>
             <if test="certificateNumber != null">certificate_number = #{certificateNumber},</if>
             <if test="address != null">address = #{address},</if>
             <if test="engineeringProperty != null">engineering_property = #{engineeringProperty},</if>
@@ -228,9 +228,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="authorization != null">authorization = #{authorization},</if>
             <if test="otherInformation != null">other_information = #{otherInformation},</if>
             <if test="companyIds != null">company_ids = #{companyIds},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="status != null">`status` = #{status},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
@@ -60,7 +60,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="safetyManagerName != null  and safetyManagerName != ''"> and safety_manager_name like concat('%', #{safetyManagerName}, '%')</if>
             <if test="safetyManagerPhone != null  and safetyManagerPhone != ''"> and safety_manager_phone = #{safetyManagerPhone}</if>
             <if test="socialUniformCreditCodeNumber != null  and socialUniformCreditCodeNumber != ''"> and social_uniform_credit_code_number = #{socialUniformCreditCodeNumber}</if>
-            <if test="legalRepresentative != null  and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
+            <if test="legalRepresentative != null  and legalRepresentative != ''"> and legal_representative like concat('%',#{legalRepresentative},'%')</if>
             <if test="legalRepresentativePhone != null  and legalRepresentativePhone != ''"> and legal_representative_phone = #{legalRepresentativePhone}</if>
             <if test="safetyPeopleName != null  and safetyPeopleName != ''"> and safety_people_name like concat('%', #{safetyPeopleName}, '%')</if>
             <if test="transportPermission != null  and transportPermission != ''"> and transport_permission = #{transportPermission}</if>
@@ -40,7 +40,7 @@ public class Consumer {
     @Autowired
     private IViolationWarningInformationService violationWarningInformationService;
-//    @KafkaListener(topics = "record_process_alarm")
+    @KafkaListener(topics = "record_process_alarm")
     public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
         log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
         String id = insertKafkaCompensation(record.value().toString());