行政办公功能优化

2c
1 parent 43ef1c10
Showing 14 changed files with 159 additions and 103 deletions
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/h5/leaveApplication/index.vue
trash-ui/src/views/h5/leaveApplication/leaveApplicationInfo.vue
trash-ui/src/views/office/conference/conferenceInfo.vue
trash-ui/src/views/office/handle/handleInfo.vue
trash-ui/src/views/office/leaveApplication/index.vue
trash-ui/src/views/office/leaveApplication/leaveApplicationInfo.vue
trash-ui/src/views/office/logistics/logisticsInfo.vue
trash-workFlow/src/main/java/com/trash/office/listener/ConferenceEndListener.java
trash-workFlow/src/main/java/com/trash/office/listener/HandleAffairsEndListener.java
trash-workFlow/src/main/java/com/trash/office/listener/HandleAffairsTwoEndListener.java
trash-workFlow/src/main/java/com/trash/office/listener/LogisticsEndListener.java
trash-workFlow/src/main/java/com/trash/office/listener/leaveEndListener.java
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
@@ -85,7 +85,7 @@
           </el-col>
         </el-row>
         <el-row type="flex" justify="center" style="margin-top: 20px;">
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" >*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
             <br/>
@@ -100,7 +100,7 @@
               x</a>
             </p>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" >*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
             <br/>
@@ -129,7 +129,7 @@
               x</a>
             </p>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" >*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
             <br/>
@@ -146,7 +146,7 @@
           </el-col>
         </el-row>
         <el-row type="flex" justify="center">
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" >*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
             <br/>
@@ -161,7 +161,7 @@
               x</a>
             </p>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" >*</span>
             <a style="color:blue;font-size: 12px;"
                @click="showFileUpload(5)">{{ form.type == 0 ? "摄像头视频截图1" : "洗车设施照片" }}</a>
@@ -177,7 +177,7 @@
               x</a>
             </p>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" v-if="form.type == 0">*</span>
             <a style="color:blue;font-size: 12px;"
                @click="showFileUpload(6)">{{ form.type == 0 ? "摄像头视频截图2" : "雾炮机" }}</a>
@@ -193,7 +193,7 @@
               x</a>
             </p>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6">
             <span style="color: red;" >*</span>
             <a style="color:blue;font-size: 12px;"
                @click="showFileUpload(7)">{{ form.type == 0 ? "摄像头视频截图3" : "裸露黄土覆盖照片" }}</a>
@@ -310,6 +310,17 @@
     <!--  会议管理  -->
     <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
       <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
+
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+<!--      <el-table :data="hisfromData" v-if="hisfromData != null">-->
+
+<!--        <el-table-column label="处理意见" align="center" prop="controlValue"/>-->
+<!--        <el-table-column label="处理人" align="center" prop="createName"/>-->
+<!--        <el-table-column label="处理时间" align="center" prop="createTime"/>-->
+<!--      </el-table>-->
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
         <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
@@ -320,6 +331,15 @@
     <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
                :close-on-click-modal="false">
       <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
         <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
@@ -391,6 +411,15 @@
     <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
                :close-on-click-modal="false">
       <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <div v-for="item in this.form.formData">
+          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                    placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+        </div>
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
         <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
@@ -20,13 +20,15 @@
         <el-select v-model="queryParams.type" placeholder="请选择请假类型"  size="small">
           <el-option label="事假" value="事假"/>
           <el-option label="病假" value="病假"/>
-          <el-option label="年假" value="年假"/>
           <el-option label="婚假" value="婚假"/>
           <el-option label="产假" value="产假"/>
           <el-option label="丧假" value="丧假"/>
-          <el-option label="探亲假" value="探亲假"/>
-          <el-option label="护理假" value="护理假"/>
           <el-option label="公休假" value="公休假"/>
+          <el-option label="探亲假" value="探亲假"/>
+          <el-option label="护理假" value="护理假"/>
+          <el-option label="亲子假" value="亲子假"/>
+          <el-option label="育儿假" value="育儿假"/>
+          <el-option label="其他" value="其他"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -109,13 +111,15 @@
           <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%">
             <el-option label="事假" value="事假"/>
             <el-option label="病假" value="病假"/>
-            <el-option label="年假" value="年假"/>
             <el-option label="婚假" value="婚假"/>
             <el-option label="产假" value="产假"/>
             <el-option label="丧假" value="丧假"/>
+            <el-option label="公休假" value="公休假"/>
             <el-option label="探亲假" value="探亲假"/>
-            <el-option label="公休假" value="公休假"/>
             <el-option label="护理假" value="护理假"/>
+            <el-option label="亲子假" value="亲子假"/>
+            <el-option label="育儿假" value="育儿假"/>
+            <el-option label="其他" value="其他"/>
           </el-select>
         </el-form-item>
@@ -201,7 +205,8 @@
   </div>
 </template>
-<script src="@/api/leave.js"/>
+<script src="@/api/leave.js">
+</script>
 <style scope>
   .el-select-dropdown__item{
     width:300px;
@@ -10,12 +10,15 @@
         <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true">
           <el-option label="事假" value="事假"/>
           <el-option label="病假" value="病假"/>
-          <el-option label="年假" value="年假"/>
           <el-option label="婚假" value="婚假"/>
           <el-option label="产假" value="产假"/>
           <el-option label="丧假" value="丧假"/>
+          <el-option label="公休假" value="公休假"/>
           <el-option label="探亲假" value="探亲假"/>
           <el-option label="护理假" value="护理假"/>
+          <el-option label="亲子假" value="亲子假"/>
+          <el-option label="育儿假" value="育儿假"/>
+          <el-option label="其他" value="其他"/>
         </el-select>
       </el-form-item>
@@ -45,11 +48,12 @@
         <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/>
       </el-form-item>
       <el-form-item label="附件图片预览" v-if="slide1.length!=0">
-        <el-image v-for="item in slide1"
+        <el-image v-for="(item, index) in slide1"
                   style="width: 150px; height: 100px; margin: 5px;"
                   :src="item"
                   :preview-src-list="slide1"
-                  :z-index="2000">
+                  :z-index="2000"
+                  :key="index">
         </el-image>
       </el-form-item>
       <el-table :data="fileEntityList">
@@ -67,6 +71,11 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
     </el-form>
   </div>
 </template>
@@ -74,7 +83,7 @@
 <script>
 import {getLeaveApplication} from "@/api/office/leaveApplication";
 import Editor from '@/components/ZcEditor';
-import {getBase64} from "@/api/business/threestep";
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "leaveApplicationInfo",
@@ -93,7 +102,9 @@ export default {
       fileEntityList: [],
       showPic: null,
       picImage: null,
-      slide1: []
+      slide1: [],
+      taskNodeName:null,
+      hisfromData:[]
     }
   },
   created() {
@@ -103,13 +114,19 @@ export default {
     init() {
       getLeaveApplication(this.idInfo).then(response => {
         this.form = response.data.leaveApplication;
+        historyFromData("workflow_leave:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
         this.fileEntityList.map(item => {
-          if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
+          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
             this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
           }
-        })
+        });
+        //this.$set(this.form,"taskNodeName",this.form.taskNodeName)
       });
     },
     /** 文件下载 */
@@ -122,6 +139,12 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
       a.click()
     },
+
+    getHistoryData(){
+      historyFromData("workflow_leave:" + this.idInfo).then(response => {
+        return response.data[response.data.length - 1].taskNodeName;
+      })
+    }
   }
 }
 </script>
@@ -64,12 +64,21 @@
         </el-table-column>
       </el-table>
     </el-row>
+    <el-row>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+    </el-row>
   </el-form>
 </template>
 <script>
 import {getConference} from "@/api/office/conference";
 import Editor from '@/components/ZcEditor';
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "conferenceInfo",
   components: {Editor},
@@ -85,7 +94,8 @@ export default {
     return {
       form: {},
       fileEntityList:[],
-      slide1:[]
+      slide1:[],
+      hisfromData:[]
     }
   },
   created() {
@@ -95,6 +105,11 @@ export default {
     init(){
       getConference(this.idInfo).then(response => {
         this.form = response.data.conference;
+        historyFromData("conference:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
         this.fileEntityList.map(item => {
@@ -114,12 +114,20 @@
         </el-table-column>
       </el-table>
     </el-row>
+    <el-row>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+    </el-row>
   </el-form>
 </template>
 <script>
 import {getHandle} from "@/api/office/handle";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "handleInfo",
@@ -168,7 +176,8 @@ export default {
           "name": "治理部"
         },
       ],
-      slide1:[]
+      slide1:[],
+      hisfromData:[]
     }
   },
   created() {
@@ -179,6 +188,21 @@ export default {
       getHandle(this.idInfo).then(response => {
         this.form = response.data.handleAffairs;
         let files = JSON.stringify(response.data.uploadFiles);
+        historyFromData("handleAffairs:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
+        historyFromData("gongwenchuli:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
+        historyFromData("yuelan:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
         this.fileEntityList.map(item => {
           if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
@@ -20,13 +20,15 @@
         <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
           <el-option label="事假" value="事假"/>
           <el-option label="病假" value="病假"/>
-          <el-option label="年假" value="年假"/>
           <el-option label="婚假" value="婚假"/>
           <el-option label="产假" value="产假"/>
           <el-option label="丧假" value="丧假"/>
+          <el-option label="公休假" value="公休假"/>
           <el-option label="探亲假" value="探亲假"/>
           <el-option label="护理假" value="护理假"/>
-          <el-option label="公休假" value="公休假"/>
+          <el-option label="亲子假" value="亲子假"/>
+          <el-option label="育儿假" value="育儿假"/>
+          <el-option label="其他" value="其他"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -155,13 +157,15 @@
           <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%">
             <el-option label="事假" value="事假"/>
             <el-option label="病假" value="病假"/>
-            <el-option label="年假" value="年假"/>
             <el-option label="婚假" value="婚假"/>
             <el-option label="产假" value="产假"/>
             <el-option label="丧假" value="丧假"/>
+            <el-option label="公休假" value="公休假"/>
             <el-option label="探亲假" value="探亲假"/>
             <el-option label="护理假" value="护理假"/>
-            <el-option label="公休假" value="公休假"/>
+            <el-option label="亲子假" value="亲子假"/>
+            <el-option label="育儿假" value="育儿假"/>
+            <el-option label="其他" value="其他"/>
           </el-select>
         </el-form-item>
@@ -10,12 +10,15 @@
         <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true">
           <el-option label="事假" value="事假"/>
           <el-option label="病假" value="病假"/>
-          <el-option label="年假" value="年假"/>
           <el-option label="婚假" value="婚假"/>
           <el-option label="产假" value="产假"/>
           <el-option label="丧假" value="丧假"/>
+          <el-option label="公休假" value="公休假"/>
           <el-option label="探亲假" value="探亲假"/>
           <el-option label="护理假" value="护理假"/>
+          <el-option label="亲子假" value="亲子假"/>
+          <el-option label="育儿假" value="育儿假"/>
+          <el-option label="其他" value="其他"/>
         </el-select>
       </el-form-item>
@@ -45,11 +48,12 @@
         <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/>
       </el-form-item>
       <el-form-item label="附件图片预览" v-if="slide1.length!=0">
-        <el-image v-for="item in slide1"
+        <el-image v-for="(item, index) in slide1"
                   style="width: 150px; height: 100px; margin: 5px;"
                   :src="item"
                   :preview-src-list="slide1"
-                  :z-index="2000">
+                  :z-index="2000"
+                  :key="index">
         </el-image>
       </el-form-item>
       <el-table :data="fileEntityList">
@@ -109,7 +113,7 @@ export default {
           if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
             this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
           }
-        })
+        });
       });
     },
     /** 文件下载 */
@@ -54,12 +54,18 @@
                 :disabled="true"
                 @input="form.quantity=form.quantity.replace(/[^0-9]/g,'');"/>
     </el-form-item>
+    <el-table :data="hisfromData" v-if="hisfromData != null">
+      <el-table-column label="处理意见" align="center" prop="controlValue"/>
+      <el-table-column label="处理人" align="center" prop="createName"/>
+      <el-table-column label="处理时间" align="center" prop="createTime"/>
+    </el-table>
   </el-form>
 </template>
 <script>
 import {getLogistics} from "@/api/office/logistics";
 import {getDict} from "@/api/dict";
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "logisticsInfo",
   props: {
@@ -74,7 +80,8 @@ export default {
     return {
       form: {},
       type:null,
-      depts:[]
+      depts:[],
+      hisfromData:[]
     }
   },
   created() {
@@ -89,6 +96,11 @@ export default {
       getLogistics(this.idInfo).then(response => {
         this.form = response.data
         this.type = response.data.type;
+        historyFromData("logistics:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
       });
     }
   }
@@ -31,28 +31,13 @@ public class ConferenceEndListener implements ExecutionListener {
         if("1".equals(status)){
             //设置为通过状态
             conference.setStatus(1);
-            //添加后勤管理（通过状态）
+            //修改后勤管理（通过状态）
             conferenceMapper.updateConference(conference);
         }else if("2".equals(status)){
             //设置为驳回状态
             conference.setStatus(2);
-            //删除当前后勤管理
-            conferenceMapper.deleteConferenceById(conference.getId());
-            //添加后勤管理（驳回状态）
-            conferenceMapper.insertConference(conference);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("conference");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(conference.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
+            //修改后勤管理（驳回状态）
+            conferenceMapper.updateConference(conference);
         }
         //流程历史存档
         WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
@@ -70,23 +70,8 @@ public class HandleAffairsEndListener implements ExecutionListener {
             //信访部门重置为null
             handleAffairs.setDeptId(null);
             handleAffairs.setDeptName(null);
-            //删除当前办文办事
-            handleAffairsMapper.deleteHandleAffairsById(id);
-            //添加办文办事（驳回状态）
-            handleAffairsMapper.insertHandleAffairs(handleAffairs);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("handle_affairs");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(handleAffairs.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
+            //修改办文办事（驳回状态）
+            handleAffairsMapper.updateHandleAffairs(handleAffairs);
         }else if ("3".equals(status)){
             //将部门id，部门名称，意见设置为null
             handleAffairs.setOpinion(null);
@@ -44,23 +44,7 @@ public class HandleAffairsTwoEndListener implements ExecutionListener {
             //信访部门重置为null
             handleAffairs.setDeptId(null);
             handleAffairs.setDeptName(null);
-            //删除当前办文办事
-            handleAffairsMapper.deleteHandleAffairsById(id);
-            //添加办文办事（驳回状态）
-            handleAffairsMapper.insertHandleAffairs(handleAffairs);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("handle_affairs");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(handleAffairs.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
+            handleAffairsMapper.updateHandleAffairs(handleAffairs);
         }
         workflowUtils.sendDataToHisTory(delegateExecution,state);
     }
@@ -36,10 +36,8 @@ public class LogisticsEndListener implements ExecutionListener {
         }else if("2".equals(status)){
             //设置为驳回状态
             logisticsManagement.setStatus(2);
-            //删除当前后勤管理
-            logisticsManagementMapper.deleteLogisticsManagementById(id);
-            //添加后勤管理（驳回状态）
-            logisticsManagementMapper.insertLogisticsManagement(logisticsManagement);
+            //修改当前后勤管理
+            logisticsManagementMapper.updateLogisticsManagement(logisticsManagement);
         }
         //流程历史存档
         WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
@@ -45,22 +45,8 @@ public class leaveEndListener implements ExecutionListener {
             //设置为驳回状态
             leaveApplication.setStatus(2);
             //删除当前请假申请
-            leaveApplicationMapper.deleteLeaveApplicationById(id);
+            leaveApplicationMapper.updateLeaveApplication(leaveApplication);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("leave_application");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            leaveApplicationMapper.insertLeaveApplication(leaveApplication);
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(leaveApplication.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
         }
         WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
+import com.trash.common.core.domain.entity.SysUser;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.file.FileUploadUtils;
@@ -204,7 +205,8 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
      * @param leaveApplication
      */
     public void initiatingProcess(LeaveApplication leaveApplication){
-        List<String> roleIds = SecurityUtils.getLoginUser().getUser().getRoleIds();
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        List<String> roleIds = sysUser.getPostIds();
         Integer roleId = 0;
         for (String role : roleIds){
             //如果是角色id为3的则为部长或部长以上