Merge branch 'dev' of 192.168.168.245:youxiw20000/trash into dev

youxiw2000
2 parents 3ab2d79f 58e04267
Showing 16 changed files with 55 additions and 37 deletions
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/office/conference/index.vue
trash-ui/src/views/office/handle/index.vue
trash-ui/src/views/office/leaveApplication/index.vue
trash-ui/src/views/office/logistics/index.vue
trash-ui/src/views/office/management/index.vue
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
trash-workFlow/src/main/java/com/trash/office/domain/Conference.java
trash-workFlow/src/main/java/com/trash/office/domain/ContractManagement.java
trash-workFlow/src/main/java/com/trash/office/domain/HandleAffairs.java
trash-workFlow/src/main/java/com/trash/office/domain/LeaveApplication.java
trash-workFlow/src/main/java/com/trash/office/domain/LogisticsManagement.java
@@ -868,7 +868,6 @@ export default {
         return;
       }
       if (this.definitionKey == "workflow_casefile") {
-        debugger;
         if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
           console.log(this.businessKey);
@@ -1026,8 +1025,6 @@ export default {
         this.form.formData[0].userNames = userNames;
         //表里存中文
         handleAffairsForm.userNames = userNames.join(",");
-        console.log(this.form)
-        console.log(handleAffairsForm)
         updateHandleAffairs(handleAffairsForm).then(res => {
           formDataSave(this.id, this.form.formData).then(response => {
@@ -80,15 +80,15 @@
     <el-table v-loading="loading" :data="violationCaseFileList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="所属区域" align="center" prop="owningRegion" />
+      <el-table-column label="违规对象" align="center" prop="projectName" />
       <el-table-column label="违规对象类型" align="center" prop="violationObjectType">
       <template slot-scope="scope">
         <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"消纳场":"企业"}}</span>
       </template>
       </el-table-column>
       <el-table-column label="违规类型" align="center" prop="violationType" />
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="企业名称" align="center" prop="companyName" />
       <el-table-column label="审批状态" align="center" prop="status">
         <template slot-scope="scope">
           <span>{{parseStatus(scope.row.status) }}</span>
@@ -99,9 +99,9 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleInfo(scope.row)"
-            v-hasPermi="['casefile:violationCaseFile:view']"
+            v-hasPermi="['casefile:violationCaseFile:edit']"
           >详情</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -175,10 +175,8 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="违规对象" prop="projectName">
-              <el-select v-model="form.projectName" :filterable="true"  placeholder="请输入项目名称" style="width: 100%;">
-                <el-option v-for="item in data" :key="item.name" :label="item.name" :value="item.name" @click.native="getObjId(item)"
-                  v-if="form.place == item.areaCode"
-                />
+                <el-select v-model="form.projectName" :filterable="true" :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">
+                  <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option>
                 </el-select>
             </el-form-item>
           </el-col>
@@ -72,15 +72,15 @@
     <el-table v-loading="loading" :data="violationWarningInformationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="所属区域" align="center" prop="owningRegion" />
+      <el-table-column label="违规对象" align="center" prop="projectName" />
       <el-table-column label="违规对象类型" align="center" prop="violationObjectType" >
         <template slot-scope="scope">
           <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"消纳场":"企业"}}</span>
         </template>
       </el-table-column>
       <el-table-column label="违规类型" align="center" prop="violationType" />
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="企业名称" align="center" prop="companyName" />
       <el-table-column label="日期" align="center" prop="createTime"/>
       <el-table-column label="审批状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -72,6 +72,7 @@
     <el-table v-loading="loading" :data="conferenceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="会议时间" align="center" prop="conferenceTime"/>
       <el-table-column label="会议地点" align="center" prop="conferenceSite"/>
       <el-table-column label="参会人员" align="center" prop="staff"/>
@@ -104,6 +104,7 @@
     <el-table v-loading="loading" :data="handleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="办文办事类型" align="center" prop="type" >
         <template slot-scope="scope">
           <span>{{ typeOfName(scope.row.type) }}</span>
@@ -82,6 +82,7 @@
     <el-table v-loading="loading" :data="leaveApplicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="申请人" align="center" prop="applicant"/>>
       <el-table-column label="联系方式" align="center" prop="phone"/>
       <el-table-column label="请假类型" align="center" prop="type"/>
@@ -93,6 +93,7 @@
     <el-table v-loading="loading" :data="logisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="申请部门" align="center" prop="deptName"/>
       <!--   用章申请   -->
       <el-table-column label="用章类型" align="center" prop="sealType" v-if="type==0"/>
@@ -74,6 +74,7 @@
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type='index'/>
       <el-table-column label="合同名称" align="center" prop="contractName"/>
       <el-table-column label="乙方" align="center" prop="secondParty"/>
       <el-table-column label="责任科室" align="center" prop="deptName"/>
@@ -18,67 +18,75 @@ public class ViolationCaseFile extends BaseEntity
     private static final long serialVersionUID = 1L;
     /** $column.columnComment */
+    @Excel(name = "序号")
     private Long id;
     /** 案卷编号 */
-    @Excel(name = "案卷编号")
     private String number;
-    /** 违规对象类型 */
-    @Excel(name = "违规对象类型")
-    private String violationObjectType;
-
     /** 所属区域 */
     @Excel(name = "所属区域")
     private String owningRegion;
+    /** 项目名称 */
+    @Excel(name = "违规对象")
+    private String projectName;
+
+    /** 违规对象类型 */
+    @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
+    private String violationObjectType;
+
+
     /** 违规类型 */
     @Excel(name = "违规类型")
     private String violationType;
     /** 违规等级 */
-    @Excel(name = "违规等级")
     private String violationGrade;
-    /** 项目名称 */
-    @Excel(name = "项目名称")
-    private String projectName;
+
     /** 企业名称 */
-    @Excel(name = "企业名称")
     private String companyName;
     /** 违规描述 */
-    @Excel(name = "违规描述")
     private String describe;
     /** 推送对象 */
-    @Excel(name = "推送对象")
     private String sendObject;
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     /** 审批状态 */
-    @Excel(name = "审批状态")
+    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
     private Integer status;
     /** 接收人 */
-    @Excel(name = "接收人")
     private String receive;
     /** 接收状态 */
-    @Excel(name = "接收状态")
     private Integer receiveStatus;
     /** 阅览人 */
-    @Excel(name = "阅览人")
     private String readBy;
     /** 阅览时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "阅览时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date readTime;
     private String abbreviation;
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public String getAbbreviation() {
         return abbreviation;
     }
@@ -20,6 +20,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
     /**
@@ -33,6 +34,12 @@ public class ViolationWarningInformation extends BaseEntity {
      */
     @Excel(name = "所属区域")
     private String owningRegion;
+
+    /**
+     * 项目名称
+     */
+    @Excel(name = "违规对象")
+    private String projectName;
     /**
      * 违规对象类型
      */
@@ -50,16 +57,11 @@ public class ViolationWarningInformation extends BaseEntity {
      */
     private String violationGrade;
-    /**
-     * 项目名称
-     */
-    @Excel(name = "项目名称")
-    private String projectName;
+
     /**
      * 企业名称
      */
-    @Excel(name = "企业名称")
     private String companyName;
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -86,6 +86,9 @@ public class Consumer {
             throw new RuntimeException("获取公司列表失败！！！");
         }
+        if(basevehicleInfo==null){
+            throw new RuntimeException("获取公司详情失败！vehicleId:"+jsonObject.getString("vehicleId"));
+        }
         //这两种类型无需累加
         if(violationType.equals("工地预警-视频设备离线超时报警") || violationType.equals("消纳场预警-视频设备离线超时报警")){
             violationWarningInformation1 = null;
@@ -20,6 +20,7 @@ public class Conference extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
     /**
@@ -20,6 +20,7 @@ public class ContractManagement extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
     /**
@@ -20,6 +20,7 @@ public class HandleAffairs extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
     /**
@@ -20,6 +20,7 @@ public class LeaveApplication extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
     /**
@@ -20,6 +20,7 @@ public class LogisticsManagement extends BaseEntity {
     /**
      * $column.columnComment
      */
+    @Excel(name = "序号")
     private Long id;
     /**