修复bug

273548560@qq.com
1 parent 8014e9dc
Showing 24 changed files with 400 additions and 52 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/dict.js
trash-ui/src/views/activiti/task/SupervisionInfo.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.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/management/index.vue
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
trash-workFlow/src/main/java/com/trash/casefile/domain/KafkaCompensation.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/casefile/mapper/KafkaCompensationMapper.java
trash-workFlow/src/main/java/com/trash/office/controller/LogisticsManagementController.java
trash-workFlow/src/main/resources/mapper/casefile/KafkaCompensationMapper.xml
@@ -14,6 +14,9 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import com.trash.casefile.domain.KafkaCompensation;
+import com.trash.casefile.kafka.Consumer;
+import com.trash.casefile.mapper.KafkaCompensationMapper;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -253,5 +256,14 @@ public class DriverTask
     }
+
+	public void kafkaCompensation() throws InterruptedException {
+		KafkaCompensation kafkaCompensation = new KafkaCompensation();
+		kafkaCompensation.setStatus(0);
+		List<KafkaCompensation> kafkaCompensationList = SpringUtils.getBean(KafkaCompensationMapper.class).selectKafkaCompensationList(kafkaCompensation);
+		for(KafkaCompensation k:kafkaCompensationList){
+			SpringUtils.getBean(Consumer.class).autoViolationWarning(k.getData(),k.getId().toString());
+		}
+	}
 }
@@ -147,3 +147,11 @@ export function getDict(params) {
     params: params
   });
 }
+
+export function getSupervision(data) {
+  return requestRemote({
+    url: '/api/gpsservice/cs/supervision/ledger/list',
+    method: 'post',
+    data: data
+  });
+}
+<template>
+  <div style="border:1px solid black;">
+    <el-row class="bd_bottom">
+      <el-col :span="4" class="bd_right bd_padding">名称</el-col>
+      <el-col :span="8" class="bd_padding">{{ infoData.name }}</el-col>
+      <el-col :span="4" class="bd_left bd_right bd_padding">所属区域</el-col>
+      <el-col :span="8" class="bd_padding">{{ infoData.areaCodeName }}</el-col>
+    </el-row>
+    <el-row class="bd_bottom">
+      <el-col :span="4" class="bd_right bd_padding">督察类型</el-col>
+      <el-col :span="8" class="bd_padding">{{ infoData.typeName }}</el-col>
+      <el-col :span="4" class="bd_left bd_right bd_padding">督察结果</el-col>
+      <el-col :span="8" class="bd_padding">{{ infoData.supervisionResultName }}</el-col>
+    </el-row>
+
+
+    <el-row class="bd_bottom">
+      <el-col :span="4" class="bd_right bd_padding">督察状态</el-col>
+      <el-col :span="8" class="bd_padding">{{ infoData.supervisionStatus == 0 ? "未督察" : "已督察" }}</el-col>
+      <el-col :span="4" class="bd_left bd_right bd_padding">督察时间</el-col>
+      <el-col :span="8" class="bd_padding">{{ infoData.supervisionAt }}</el-col>
+    </el-row>
+    <el-row class="bd_bottom">
+      <el-col :span="4" class="bd_right bd_padding">创建时间</el-col>
+      <el-col :span="20" class="bd_padding">{{ infoData.createAt }}</el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  name: "SupervisionInfo",
+  props: {
+    infoData: {
+      type: Object
+    },
+  },
+  data() {
+    return {}
+  },
+  created() {
+
+  },
+  methods: {}
+
+}
+</script>
@@ -329,6 +329,14 @@
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body :close-on-click-modal="false">
+      <supervisionInfo :infoData="supervisionData"/>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
@@ -354,7 +362,8 @@ import {updateViolationCaseFileReader1} from &quot;@/api/casefile/violationWarningInf
 import {
   getArea,
   getDict,
-  getUsers
+  getUsers,
+  getSupervision
 } from "@/api/dict";
 import {
@@ -381,6 +390,7 @@ import handleInfo from &quot;@/views/office/handle/handleInfo&quot;;
 import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
 import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
 import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+import supervisionInfo from "./SupervisionInfo";
 export default {
   name: "task",
@@ -398,7 +408,8 @@ export default {
     contractInfo,
     caseOfflineInfo,
     violationCaseFileInfo,
-    violationWarningInformationInfo
+    violationWarningInformationInfo,
+    supervisionInfo
   },
   data() {
     return {
@@ -485,6 +496,8 @@ export default {
       options: [],
       usersName: [],
       deptName:null,
+      supervisionData: null,
+      supervisionOpen:false,
     };
   },
   created() {
@@ -665,6 +678,21 @@ export default {
           this.violationCaseFile1 = true;
           return;
         }
+        if(this.definitionKey.indexOf("supervision")>-1){
+          console.log(row)
+          const params = {
+            id: "1fee149a03a3482ba45367745fea6669",
+            type:1,
+            page:1,
+            size:1
+          }
+          getSupervision(params).then(res=>{
+            console.log(res)
+            this.supervisionData = res.result.list[0];
+            this.supervisionOpen = true;
+          })
+          return;
+        }
         this.open = true;
         this.title = "审批";
       });
@@ -914,6 +942,15 @@ export default {
           }
         }
       }
+
+      if(this.definitionKey.indexOf("supervision")>-1){
+        formDataSave(this.id, this.form.formData).then(response => {
+          this.msgSuccess("审批成功");
+          this.supervisionOpen = false;
+          this.getList();
+        });
+      }
+
     },
     conferenceSubmitForm(value) {
       this.form.formData[0].controlValue = value;
@@ -219,7 +219,7 @@
           <el-upload
             ref="upload"
             action=""
-            accept=".docx,.xlsx,.xls,.ppt,.doc,.pdf,.png,.jpeg,.png,.jpg"
+            accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg"
             :on-change="fileChange"
             :auto-upload="false"
             :show-file-list="false"
@@ -627,7 +627,7 @@ export default {
     },
     /**
      * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
      * 大小不超过20M
      * */
     fileChange(file, fileList) {
@@ -655,7 +655,7 @@ export default {
       }
       let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
       //格式符合后判断大小
-      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
+      if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
         let max5M = file.size / 1024 / 1024 < 20;
         if (!max5M) {
           this.$message({
@@ -669,9 +669,10 @@ export default {
         }
       } else {
         this.$message({
-          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
+          message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
           type: 'warning'
         });
+        fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
     // 删除文件
@@ -78,8 +78,8 @@ export default {
       let allRepCount = 0;
       for (let i in data) {
-        allCount += Number(data[i].count);
-        allRepCount += Number(data[i].repCount);
+        allCount += Number(data[i].count==null?0:data[i].count);
+        allRepCount += Number(data[i].repCount==null?0:data[i].repCount);
       }
@@ -97,7 +97,11 @@ export default {
         }
         if (index == 4) {
-          sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
+          if(allCount==0||allRepCount==0){
+            sums[4] = "0" + "%";
+          }else{
+            sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
+          }
         }
       })
@@ -204,7 +204,7 @@
           <el-upload
             ref="upload"
             action=""
-            accept=".docx,.xlsx,.xls,.ppt,.doc,.pdf,.png,.jpeg,.png,.jpg"
+            accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg"
             :on-change="fileChange"
             :auto-upload="false"
             :show-file-list="false"
@@ -589,7 +589,7 @@ export default {
     },
     /**
      * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
      * 大小不超过20M
      * */
     fileChange(file, fileList) {
@@ -617,7 +617,7 @@ export default {
       }
       let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
       //格式符合后判断大小
-      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
+      if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
         let max5M = file.size / 1024 / 1024 < 20;
         if (!max5M) {
           this.$message({
@@ -631,9 +631,10 @@ export default {
         }
       } else {
         this.$message({
-          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
+          message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
           type: 'warning'
         });
+        fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
     // 删除文件
@@ -77,9 +77,8 @@ export default {
       let allCount = 0;
       let allRepCount = 0;
       for (let i in data) {
-
-        allCount += Number(data[i].count);
-        allRepCount += Number(data[i].repCount);
+        allCount += Number(data[i].count==null?0:data[i].count);
+        allRepCount += Number(data[i].repCount==null?0:data[i].repCount);
       }
@@ -97,7 +96,12 @@ export default {
         }
         if (index == 4) {
-          sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
+          if(allCount==0||allRepCount==0){
+            sums[4] = "0" + "%";
+          }else{
+            sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
+          }
+
         }
       })
@@ -490,6 +490,7 @@ export default {
           message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!',
           type: 'warning'
         });
+        fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
     // 删除文件
@@ -499,7 +499,6 @@ export default {
      * 大小不超过5M
      * */
     fileChange(file, fileList) {
-      console.log(fileList)
       let count = 0;
       for (let i = 0; i < fileList.length; i++) {
         // console.log(fileList.length)
@@ -541,6 +540,7 @@ export default {
           message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!',
           type: 'warning'
         });
+        fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
     // 删除文件
@@ -528,6 +528,7 @@ export default {
           message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
           type: 'warning'
         });
+        fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
     // 删除文件
@@ -569,6 +569,7 @@ export default {
           message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!',
           type: 'warning'
         });
+        fileList = fileList.splice(fileList.length - 1, 1);
       }
     },
     // 删除文件
@@ -137,6 +137,10 @@ public class ViolationCaseFileController extends BaseController
     public AjaxResult getTable(String owningRegion,String startDate,String endDate){
     	List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
+        if(owningRegion.equals("长沙市")){
+            owningRegion = "";
+        }
+
         if(startDate != null && endDate != null&&startDate!=""&&endDate!=""){
             startDate = startDate.substring(0,10);
             endDate = endDate.substring(0,10);
@@ -174,7 +178,7 @@ public class ViolationCaseFileController extends BaseController
         		maps.add(map);
     		}else{
     			double pct = ((double)repCount)/((double)count);
-        		map.put("repPct",(pct*100) + "%");
+        		map.put("repPct",String.format("%.2f", (pct*100)) + "%");
         		maps.add(map);
     		}
@@ -67,7 +67,7 @@ public class ViolationWarningInformationController extends BaseController
         	list.get(i).setId((long)i+1);
         }
         ExcelUtil<ViolationWarningInformation> util = new ExcelUtil<ViolationWarningInformation>(ViolationWarningInformation.class);
-        return util.exportExcel(list, "violationWarningInformation");
+        return util.exportExcel(list, "违规预警信息");
     }
     /**
@@ -138,7 +138,9 @@ public class ViolationWarningInformationController extends BaseController
     public AjaxResult getTable(String owningRegion,String startDate,String endDate){
         List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
-
+        if(owningRegion.equals("长沙市")){
+            owningRegion = "";
+        }
         if(startDate != null && endDate != null&&startDate!=""&&endDate!=""){
             startDate = startDate.substring(0,10);
             endDate = endDate.substring(0,10);
@@ -169,18 +171,19 @@ public class ViolationWarningInformationController extends BaseController
             map.put("count", count + "");
             map.put("repCount", repCount + "");
-            if(count == 0){
+            if(repCount == 0){
                 double pct = ((double)repCount)/((double)count);
                 map.put("repPct","0%");
                 maps.add(map);
             }else{
                 double pct = ((double)repCount)/((double)count);
-                map.put("repPct",(pct*100) + "%");
+                map.put("repPct",String.format("%.2f", (pct*100)) + "%");
                 maps.add(map);
             }
+
         }
+package com.trash.casefile.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+
+/**
+ * kafka补偿对象 kafka_compensation
+ * 
+ * @author 2c
+ * @date 2023-05-23
+ */
+public class KafkaCompensation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** kafka数据 */
+    private String data;
+
+    /** 消费状态，0:未消费，1:已消费 */
+    private Integer status;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setData(String data) 
+    {
+        this.data = data;
+    }
+
+    public String getData() 
+    {
+        return data;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("data", getData())
+            .append("createTime", getCreateTime())
+            .append("status", getStatus())
+            .toString();
+    }
+}
@@ -25,20 +25,19 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 案卷编号
      */
-    @Excel(name = "案卷编号")
-    private String number;
-    /**
-     * 违规对象类型
-     */
-    @Excel(name = "违规对象类型")
-    private String violationObjectType;
+    private String number;
     /**
      * 所属区域
      */
     @Excel(name = "所属区域")
     private String owningRegion;
+    /**
+     * 违规对象类型
+     */
+    @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
+    private String violationObjectType;
     /**
      * 违规类型
@@ -49,7 +48,6 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 违规等级
      */
-    @Excel(name = "违规等级")
     private String violationGrade;
     /**
@@ -64,50 +62,59 @@ public class ViolationWarningInformation extends BaseEntity {
     @Excel(name = "企业名称")
     private String companyName;
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     /**
      * 违规描述
      */
-    @Excel(name = "违规描述")
     private String describe;
     /**
      * 推送对象
      */
-    @Excel(name = "推送对象")
     private String sendObject;
     /**
      * 审批状态
      */
+    @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 HH:mm:ss")
-    @Excel(name = "阅览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     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;
     }
@@ -2,7 +2,9 @@ package com.trash.casefile.kafka;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.trash.casefile.domain.KafkaCompensation;
 import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.casefile.mapper.KafkaCompensationMapper;
 import com.trash.casefile.mapper.ViolationWarningInformationMapper;
 import com.trash.casefile.service.IViolationWarningInformationService;
 import com.trash.common.config.trashConfig;
@@ -36,7 +38,8 @@ public class Consumer {
     @KafkaListener(topics = "record_process_alarm")
     public void consume(@Payload String data) throws InterruptedException {
         log.info("kafka消费数据成功,data:" + data);
-        autoViolationWarning(data);
+        String id = insertKafkaCompensation(data);
+        autoViolationWarning(data,id);
     }
     @Autowired
@@ -48,13 +51,15 @@ public class Consumer {
     @Autowired
     RedisCache redisCache;
-    public void autoViolationWarning(String data) throws InterruptedException {
+    public void autoViolationWarning(String data,String id) throws InterruptedException {
+
+
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警未按时间作业",
                 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
                 "44030033=闯禁行驶", "44030034=失信车辆作业"};
         JSONObject jsonObject = JSONObject.parseObject(data);
-        //q:获取当前时间
+
         String nowHour = DateFormatUtils.format(new Date(), "HH");
         String nowDate = null;
         String tomorrowDate = null;
@@ -177,13 +182,25 @@ public class Consumer {
                 e.printStackTrace();
             }
         } else {
-            String describe = violationWarningInformation1.getDescribe() + ";" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+            String describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
                     + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
                     jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
             violationWarningInformation1.setDescribe(describe);
             SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
         }
+        //kafka消费成功
+        KafkaCompensation kafkaCompensation = new KafkaCompensation();
+        kafkaCompensation.setId(Long.valueOf(id));
+        kafkaCompensation.setStatus(1);
+        SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
+    }
-
+    public String insertKafkaCompensation(String data){
+        KafkaCompensation kafkaCompensation = new KafkaCompensation();
+        kafkaCompensation.setData(data);
+        kafkaCompensation.setCreateTime(DateUtils.getNowDate());
+        kafkaCompensation.setStatus(0);
+        SpringUtils.getBean(KafkaCompensationMapper.class).insertKafkaCompensation(kafkaCompensation);
+        return kafkaCompensation.getId().toString();
     }
 }
+package com.trash.casefile.mapper;
+
+import java.util.List;
+import com.trash.casefile.domain.KafkaCompensation;
+
+/**
+ * kafka补偿Mapper接口
+ * 
+ * @author 2c
+ * @date 2023-05-23
+ */
+public interface KafkaCompensationMapper 
+{
+    /**
+     * 查询kafka补偿
+     * 
+     * @param id kafka补偿ID
+     * @return kafka补偿
+     */
+        KafkaCompensation selectKafkaCompensationById(Long id);
+
+    /**
+     * 查询kafka补偿列表
+     * 
+     * @param kafkaCompensation kafka补偿
+     * @return kafka补偿集合
+     */
+    List<KafkaCompensation> selectKafkaCompensationList(KafkaCompensation kafkaCompensation);
+
+    /**
+     * 新增kafka补偿
+     * 
+     * @param kafkaCompensation kafka补偿
+     * @return 结果
+     */
+    int insertKafkaCompensation(KafkaCompensation kafkaCompensation);
+
+    /**
+     * 修改kafka补偿
+     * 
+     * @param kafkaCompensation kafka补偿
+     * @return 结果
+     */
+    int updateKafkaCompensation(KafkaCompensation kafkaCompensation);
+
+    /**
+     * 删除kafka补偿
+     * 
+     * @param id kafka补偿ID
+     * @return 结果
+     */
+    int deleteKafkaCompensationById(Long id);
+
+    /**
+     * 批量删除kafka补偿
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteKafkaCompensationByIds(Long[] ids);
+}
@@ -63,7 +63,7 @@ public class LogisticsManagementController extends BaseController
             	list.get(i).setId((long)i+1);
             }
             ExcelUtil<LogisticsManagementSeal> util = new ExcelUtil<>(LogisticsManagementSeal.class);
-            return util.exportExcel(list, "后勤管理");
+            return util.exportExcel(list, "用章申请");
         }else{
             List<LogisticsManagementGoods> list = logisticsManagementService.selectLogisticsManagementGoodsList(logisticsManagement);
@@ -71,7 +71,12 @@ public class LogisticsManagementController extends BaseController
             	list.get(i).setId((long)i+1);
             }
             ExcelUtil<LogisticsManagementGoods> util = new ExcelUtil<>(LogisticsManagementGoods.class);
-            return util.exportExcel(list, "后勤管理");
+            if(logisticsManagement.getType().equals("1")){
+                return util.exportExcel(list, "物品申请");
+            }else{
+                return util.exportExcel(list, "物品采购申请");
+            }
+
         }
     }
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.casefile.mapper.KafkaCompensationMapper">
+    
+    <resultMap type="KafkaCompensation" id="KafkaCompensationResult">
+        <result property="id"    column="id"    />
+        <result property="data"    column="data"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectKafkaCompensationVo">
+        select id, data, create_time, status from kafka_compensation
+    </sql>
+
+    <select id="selectKafkaCompensationList" parameterType="KafkaCompensation" resultMap="KafkaCompensationResult">
+        <include refid="selectKafkaCompensationVo"/>
+        <where>  
+            <if test="data != null  and data != ''"> and data = #{data}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectKafkaCompensationById" parameterType="Long" resultMap="KafkaCompensationResult">
+        <include refid="selectKafkaCompensationVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertKafkaCompensation" parameterType="KafkaCompensation" useGeneratedKeys="true" keyProperty="id">
+        insert into kafka_compensation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="data != null">data,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="data != null">#{data},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateKafkaCompensation" parameterType="KafkaCompensation">
+        update kafka_compensation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="data != null">data = #{data},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKafkaCompensationById" parameterType="Long">
+        delete from kafka_compensation where id = #{id}
+    </delete>
+
+    <delete id="deleteKafkaCompensationByIds" parameterType="String">
+        delete from kafka_compensation where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>
 \ No newline at end of file
@@ -50,6 +50,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="readTime != null "> and read_time = #{readTime}</if>
             <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
         </where>
+        order by create_time desc
     </select>
     <select id="selectViolationCaseFileListByTable" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
@@ -42,6 +42,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="createTime != null"> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
         </where>
+        order by create_time desc
     </select>
     <select id="selectViolationWarningInformationListByTable" parameterType="ViolationWarningInformation" resultMap="ViolationWarningInformationResult">
@@ -33,14 +33,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <select id="selectHandleAffairsList" parameterType="HandleAffairs" resultMap="HandleAffairsResult">
         <include refid="selectHandleAffairsVo"/>
         <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="company != null  and company != ''"> and company like concat('%',#{company},'%')</if>
+            <if test="receiveTime != null "> and receive_time like concat('%',SUBSTRING(#{receiveTime},1,10),'%')</if>
+            <if test="title != null  and title != ''"> and title like concat('%',#{title},'%') </if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="appeal != null  and appeal != ''"> and appeal = #{appeal}</if>
-            <if test="sendPerson != null  and sendPerson != ''"> and send_person = #{sendPerson}</if>
+            <if test="sendPerson != null  and sendPerson != ''"> and send_person like concat('%',#{sendPerson},'%')</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="deptName != null "> and dept_name = #{deptName}</if>
+             <if test="sendDate != null "> and send_date = #{sendDate}</if>
         </where>
     </select>
@@ -35,7 +35,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectLogisticsManagementVo"/>
         <where>  
             <if test="type != null "> and type = #{type}</if>
-            <if test="deptName != null "> and dept_name = #{deptName}</if>
+            <if test="deptName != null and deptName != ''"> and dept_name = #{deptName}</if>
             <if test="sealType != null  and sealType != ''"> and seal_type = #{sealType}</if>
             <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if>
             <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if>
@@ -52,7 +52,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectLogisticsManagementVo"/>
         <where>
             <if test="type != null "> and type = #{type}</if>
-            <if test="deptName != null "> and dept_name = #{deptName}</if>
+            <if test="deptName != null and deptName != ''"> and dept_name = #{deptName}</if>
             <if test="sealType != null  and sealType != ''"> and seal_type = #{sealType}</if>
             <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if>
             <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if>
@@ -69,7 +69,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectLogisticsManagementVo"/>
         <where>
             <if test="type != null "> and type = #{type}</if>
-            <if test="deptName != null "> and dept_name = #{deptName}</if>
+            <if test="deptName != null and deptName != ''"> and dept_name = #{deptName} </if>
             <if test="sealType != null  and sealType != ''"> and seal_type = #{sealType}</if>
             <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if>
             <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if>