youxiw2000 / trash · Commits

Commit b11ba85f49358c6beb6222a18a09b7c0aefa4cd8

Authored by 2c
1 parent 43ef1c10
build: skipped

行政办公功能优化

Inline Side-by-side
Showing 14 changed files with 159 additions and 103 deletions
trash-ui/src/views/activiti/task/index.vue
  View file @b11ba85
... ... @@ -85,7 +85,7 @@
85 85 </el-col>
86 86 </el-row>
87 87 <el-row type="flex" justify="center" style="margin-top: 20px;">
88   - <el-col :span="6">
  88 + <el-col :span="6">
89 89 <span style="color: red;" >*</span>
90 90 <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
91 91 <br/>
... ... @@ -100,7 +100,7 @@
100 100 x</a>
101 101 </p>
102 102 </el-col>
103   - <el-col :span="6">
  103 + <el-col :span="6">
104 104 <span style="color: red;" >*</span>
105 105 <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
106 106 <br/>
... ... @@ -129,7 +129,7 @@
129 129 x</a>
130 130 </p>
131 131 </el-col>
132   - <el-col :span="6">
  132 + <el-col :span="6">
133 133 <span style="color: red;" >*</span>
134 134 <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
135 135 <br/>
... ... @@ -146,7 +146,7 @@
146 146 </el-col>
147 147 </el-row>
148 148 <el-row type="flex" justify="center">
149   - <el-col :span="6">
  149 + <el-col :span="6">
150 150 <span style="color: red;" >*</span>
151 151 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
152 152 <br/>
... ... @@ -161,7 +161,7 @@
161 161 x</a>
162 162 </p>
163 163 </el-col>
164   - <el-col :span="6">
  164 + <el-col :span="6">
165 165 <span style="color: red;" >*</span>
166 166 <a style="color:blue;font-size: 12px;"
167 167 @click="showFileUpload(5)">{{ form.type == 0 ? "摄像头视频截图1" : "洗车设施照片" }}</a>
... ... @@ -177,7 +177,7 @@
177 177 x</a>
178 178 </p>
179 179 </el-col>
180   - <el-col :span="6">
  180 + <el-col :span="6">
181 181 <span style="color: red;" v-if="form.type == 0">*</span>
182 182 <a style="color:blue;font-size: 12px;"
183 183 @click="showFileUpload(6)">{{ form.type == 0 ? "摄像头视频截图2" : "雾炮机" }}</a>
... ... @@ -193,7 +193,7 @@
193 193 x</a>
194 194 </p>
195 195 </el-col>
196   - <el-col :span="6">
  196 + <el-col :span="6">
197 197 <span style="color: red;" >*</span>
198 198 <a style="color:blue;font-size: 12px;"
199 199 @click="showFileUpload(7)">{{ form.type == 0 ? "摄像头视频截图3" : "裸露黄土覆盖照片" }}</a>
... ... @@ -310,6 +310,17 @@
310 310 <!-- 会议管理 -->
311 311 <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
312 312 <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
  313 +
  314 + <div v-for="item in this.form.formData">
  315 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  316 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  317 + </div>
  318 +<!-- <el-table :data="hisfromData" v-if="hisfromData != null">-->
  319 +
  320 +<!-- <el-table-column label="处理意见" align="center" prop="controlValue"/>-->
  321 +<!-- <el-table-column label="处理人" align="center" prop="createName"/>-->
  322 +<!-- <el-table-column label="处理时间" align="center" prop="createTime"/>-->
  323 +<!-- </el-table>-->
313 324 <div slot="footer" class="dialog-footer">
314 325 <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
315 326 <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
... ... @@ -320,6 +331,15 @@
320 331 <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
321 332 :close-on-click-modal="false">
322 333 <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
  334 + <div v-for="item in this.form.formData">
  335 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  336 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  337 + </div>
  338 + <el-table :data="hisfromData" v-if="hisfromData != null">
  339 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  340 + <el-table-column label="处理人" align="center" prop="createName"/>
  341 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  342 + </el-table>
323 343 <div slot="footer" class="dialog-footer">
324 344 <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
325 345 <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
... ... @@ -391,6 +411,15 @@
391 411 <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
392 412 :close-on-click-modal="false">
393 413 <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
  414 + <el-table :data="hisfromData" v-if="hisfromData != null">
  415 + <div v-for="item in this.form.formData">
  416 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  417 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  418 + </div>
  419 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  420 + <el-table-column label="处理人" align="center" prop="createName"/>
  421 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  422 + </el-table>
394 423 <div slot="footer" class="dialog-footer">
395 424 <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
396 425 <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
... ...
trash-ui/src/views/h5/leaveApplication/index.vue
  View file @b11ba85
... ... @@ -20,13 +20,15 @@
20 20 <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
21 21 <el-option label="事假" value="事假"/>
22 22 <el-option label="病假" value="病假"/>
23   - <el-option label="年假" value="年假"/>
24 23 <el-option label="婚假" value="婚假"/>
25 24 <el-option label="产假" value="产假"/>
26 25 <el-option label="丧假" value="丧假"/>
27   - <el-option label="探亲假" value="探亲假"/>
28   - <el-option label="护理假" value="护理假"/>
29 26 <el-option label="公休假" value="公休假"/>
  27 + <el-option label="探亲假" value="探亲假"/>
  28 + <el-option label="护理假" value="护理假"/>
  29 + <el-option label="亲子假" value="亲子假"/>
  30 + <el-option label="育儿假" value="育儿假"/>
  31 + <el-option label="其他" value="其他"/>
30 32 </el-select>
31 33 </el-form-item>
32 34 <el-form-item>
... ... @@ -109,13 +111,15 @@
109 111 <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%">
110 112 <el-option label="事假" value="事假"/>
111 113 <el-option label="病假" value="病假"/>
112   - <el-option label="年假" value="年假"/>
113 114 <el-option label="婚假" value="婚假"/>
114 115 <el-option label="产假" value="产假"/>
115 116 <el-option label="丧假" value="丧假"/>
  117 + <el-option label="公休假" value="公休假"/>
116 118 <el-option label="探亲假" value="探亲假"/>
117   - <el-option label="公休假" value="公休假"/>
118 119 <el-option label="护理假" value="护理假"/>
  120 + <el-option label="亲子假" value="亲子假"/>
  121 + <el-option label="育儿假" value="育儿假"/>
  122 + <el-option label="其他" value="其他"/>
119 123 </el-select>
120 124 </el-form-item>
121 125  
... ... @@ -201,7 +205,8 @@
201 205 </div>
202 206 </template>
203 207  
204   -<script src="@/api/leave.js"/>
  208 +<script src="@/api/leave.js">
  209 +</script>
205 210 <style scope>
206 211 .el-select-dropdown__item{
207 212 width:300px;
... ...
trash-ui/src/views/h5/leaveApplication/leaveApplicationInfo.vue
  View file @b11ba85
... ... @@ -10,12 +10,15 @@
10 10 <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true">
11 11 <el-option label="事假" value="事假"/>
12 12 <el-option label="病假" value="病假"/>
13   - <el-option label="年假" value="年假"/>
14 13 <el-option label="婚假" value="婚假"/>
15 14 <el-option label="产假" value="产假"/>
16 15 <el-option label="丧假" value="丧假"/>
  16 + <el-option label="公休假" value="公休假"/>
17 17 <el-option label="探亲假" value="探亲假"/>
18 18 <el-option label="护理假" value="护理假"/>
  19 + <el-option label="亲子假" value="亲子假"/>
  20 + <el-option label="育儿假" value="育儿假"/>
  21 + <el-option label="其他" value="其他"/>
19 22 </el-select>
20 23 </el-form-item>
21 24  
... ... @@ -45,11 +48,12 @@
45 48 <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/>
46 49 </el-form-item>
47 50 <el-form-item label="附件图片预览" v-if="slide1.length!=0">
48   - <el-image v-for="item in slide1"
  51 + <el-image v-for="(item, index) in slide1"
49 52 style="width: 150px; height: 100px; margin: 5px;"
50 53 :src="item"
51 54 :preview-src-list="slide1"
52   - :z-index="2000">
  55 + :z-index="2000"
  56 + :key="index">
53 57 </el-image>
54 58 </el-form-item>
55 59 <el-table :data="fileEntityList">
... ... @@ -67,6 +71,11 @@
67 71 </template>
68 72 </el-table-column>
69 73 </el-table>
  74 + <el-table :data="hisfromData" v-if="hisfromData != null">
  75 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  76 + <el-table-column label="处理人" align="center" prop="createName"/>
  77 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  78 + </el-table>
70 79 </el-form>
71 80 </div>
72 81 </template>
... ... @@ -74,7 +83,7 @@
74 83 <script>
75 84 import {getLeaveApplication} from "@/api/office/leaveApplication";
76 85 import Editor from '@/components/ZcEditor';
77   -import {getBase64} from "@/api/business/threestep";
  86 +import {historyFromData} from "@/api/activiti/historyFormdata";
78 87  
79 88 export default {
80 89 name: "leaveApplicationInfo",
... ... @@ -93,7 +102,9 @@ export default {
93 102 fileEntityList: [],
94 103 showPic: null,
95 104 picImage: null,
96   - slide1: []
  105 + slide1: [],
  106 + taskNodeName:null,
  107 + hisfromData:[]
97 108 }
98 109 },
99 110 created() {
... ... @@ -103,13 +114,19 @@ export default {
103 114 init() {
104 115 getLeaveApplication(this.idInfo).then(response => {
105 116 this.form = response.data.leaveApplication;
  117 + historyFromData("workflow_leave:" + this.idInfo).then(response => {
  118 + for(let i in response.data){
  119 + this.hisfromData.push(response.data[i]);
  120 + }
  121 + })
106 122 let files = JSON.stringify(response.data.uploadFiles);
107 123 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
108 124 this.fileEntityList.map(item => {
109   - if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
  125 + if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
110 126 this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
111 127 }
112   - })
  128 + });
  129 + //this.$set(this.form,"taskNodeName",this.form.taskNodeName)
113 130 });
114 131 },
115 132 /** 文件下载 */
... ... @@ -122,6 +139,12 @@ export default {
122 139 a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
123 140 a.click()
124 141 },
  142 +
  143 + getHistoryData(){
  144 + historyFromData("workflow_leave:" + this.idInfo).then(response => {
  145 + return response.data[response.data.length - 1].taskNodeName;
  146 + })
  147 + }
125 148 }
126 149 }
127 150 </script>
... ...
trash-ui/src/views/office/conference/conferenceInfo.vue
  View file @b11ba85
... ... @@ -64,12 +64,21 @@
64 64 </el-table-column>
65 65 </el-table>
66 66 </el-row>
  67 + <el-row>
  68 + <el-table :data="hisfromData" v-if="hisfromData != null">
  69 +
  70 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  71 + <el-table-column label="处理人" align="center" prop="createName"/>
  72 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  73 + </el-table>
  74 + </el-row>
67 75 </el-form>
68 76 </template>
69 77  
70 78 <script>
71 79 import {getConference} from "@/api/office/conference";
72 80 import Editor from '@/components/ZcEditor';
  81 +import {historyFromData} from "@/api/activiti/historyFormdata";
73 82 export default {
74 83 name: "conferenceInfo",
75 84 components: {Editor},
... ... @@ -85,7 +94,8 @@ export default {
85 94 return {
86 95 form: {},
87 96 fileEntityList:[],
88   - slide1:[]
  97 + slide1:[],
  98 + hisfromData:[]
89 99 }
90 100 },
91 101 created() {
... ... @@ -95,6 +105,11 @@ export default {
95 105 init(){
96 106 getConference(this.idInfo).then(response => {
97 107 this.form = response.data.conference;
  108 + historyFromData("conference:" + this.idInfo).then(response => {
  109 + for(let i in response.data){
  110 + this.hisfromData.push(response.data[i]);
  111 + }
  112 + })
98 113 let files = JSON.stringify(response.data.uploadFiles);
99 114 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
100 115 this.fileEntityList.map(item => {
... ...
trash-ui/src/views/office/handle/handleInfo.vue
  View file @b11ba85
... ... @@ -114,12 +114,20 @@
114 114 </el-table-column>
115 115 </el-table>
116 116 </el-row>
  117 + <el-row>
  118 + <el-table :data="hisfromData" v-if="hisfromData != null">
  119 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  120 + <el-table-column label="处理人" align="center" prop="createName"/>
  121 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  122 + </el-table>
  123 + </el-row>
117 124 </el-form>
118 125 </template>
119 126  
120 127 <script>
121 128 import {getHandle} from "@/api/office/handle";
122 129 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
  130 +import {historyFromData} from "@/api/activiti/historyFormdata";
123 131  
124 132 export default {
125 133 name: "handleInfo",
... ... @@ -168,7 +176,8 @@ export default {
168 176 "name": "治理部"
169 177 },
170 178 ],
171   - slide1:[]
  179 + slide1:[],
  180 + hisfromData:[]
172 181 }
173 182 },
174 183 created() {
... ... @@ -179,6 +188,21 @@ export default {
179 188 getHandle(this.idInfo).then(response => {
180 189 this.form = response.data.handleAffairs;
181 190 let files = JSON.stringify(response.data.uploadFiles);
  191 + historyFromData("handleAffairs:" + this.idInfo).then(response => {
  192 + for(let i in response.data){
  193 + this.hisfromData.push(response.data[i]);
  194 + }
  195 + })
  196 + historyFromData("gongwenchuli:" + this.idInfo).then(response => {
  197 + for(let i in response.data){
  198 + this.hisfromData.push(response.data[i]);
  199 + }
  200 + })
  201 + historyFromData("yuelan:" + this.idInfo).then(response => {
  202 + for(let i in response.data){
  203 + this.hisfromData.push(response.data[i]);
  204 + }
  205 + })
182 206 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
183 207 this.fileEntityList.map(item => {
184 208 if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
... ...
trash-ui/src/views/office/leaveApplication/index.vue
  View file @b11ba85
... ... @@ -20,13 +20,15 @@
20 20 <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
21 21 <el-option label="事假" value="事假"/>
22 22 <el-option label="病假" value="病假"/>
23   - <el-option label="年假" value="年假"/>
24 23 <el-option label="婚假" value="婚假"/>
25 24 <el-option label="产假" value="产假"/>
26 25 <el-option label="丧假" value="丧假"/>
  26 + <el-option label="公休假" value="公休假"/>
27 27 <el-option label="探亲假" value="探亲假"/>
28 28 <el-option label="护理假" value="护理假"/>
29   - <el-option label="公休假" value="公休假"/>
  29 + <el-option label="亲子假" value="亲子假"/>
  30 + <el-option label="育儿假" value="育儿假"/>
  31 + <el-option label="其他" value="其他"/>
30 32 </el-select>
31 33 </el-form-item>
32 34 <el-form-item>
... ... @@ -155,13 +157,15 @@
155 157 <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%">
156 158 <el-option label="事假" value="事假"/>
157 159 <el-option label="病假" value="病假"/>
158   - <el-option label="年假" value="年假"/>
159 160 <el-option label="婚假" value="婚假"/>
160 161 <el-option label="产假" value="产假"/>
161 162 <el-option label="丧假" value="丧假"/>
  163 + <el-option label="公休假" value="公休假"/>
162 164 <el-option label="探亲假" value="探亲假"/>
163 165 <el-option label="护理假" value="护理假"/>
164   - <el-option label="公休假" value="公休假"/>
  166 + <el-option label="亲子假" value="亲子假"/>
  167 + <el-option label="育儿假" value="育儿假"/>
  168 + <el-option label="其他" value="其他"/>
165 169 </el-select>
166 170 </el-form-item>
167 171  
... ...
trash-ui/src/views/office/leaveApplication/leaveApplicationInfo.vue
  View file @b11ba85
... ... @@ -10,12 +10,15 @@
10 10 <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true">
11 11 <el-option label="事假" value="事假"/>
12 12 <el-option label="病假" value="病假"/>
13   - <el-option label="年假" value="年假"/>
14 13 <el-option label="婚假" value="婚假"/>
15 14 <el-option label="产假" value="产假"/>
16 15 <el-option label="丧假" value="丧假"/>
  16 + <el-option label="公休假" value="公休假"/>
17 17 <el-option label="探亲假" value="探亲假"/>
18 18 <el-option label="护理假" value="护理假"/>
  19 + <el-option label="亲子假" value="亲子假"/>
  20 + <el-option label="育儿假" value="育儿假"/>
  21 + <el-option label="其他" value="其他"/>
19 22 </el-select>
20 23 </el-form-item>
21 24  
... ... @@ -45,11 +48,12 @@
45 48 <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/>
46 49 </el-form-item>
47 50 <el-form-item label="附件图片预览" v-if="slide1.length!=0">
48   - <el-image v-for="item in slide1"
  51 + <el-image v-for="(item, index) in slide1"
49 52 style="width: 150px; height: 100px; margin: 5px;"
50 53 :src="item"
51 54 :preview-src-list="slide1"
52   - :z-index="2000">
  55 + :z-index="2000"
  56 + :key="index">
53 57 </el-image>
54 58 </el-form-item>
55 59 <el-table :data="fileEntityList">
... ... @@ -109,7 +113,7 @@ export default {
109 113 if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
110 114 this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
111 115 }
112   - })
  116 + });
113 117 });
114 118 },
115 119 /** 文件下载 */
... ...
trash-ui/src/views/office/logistics/logisticsInfo.vue
  View file @b11ba85
... ... @@ -54,12 +54,18 @@
54 54 :disabled="true"
55 55 @input="form.quantity=form.quantity.replace(/[^0-9]/g,'');"/>
56 56 </el-form-item>
  57 + <el-table :data="hisfromData" v-if="hisfromData != null">
  58 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  59 + <el-table-column label="处理人" align="center" prop="createName"/>
  60 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  61 + </el-table>
57 62 </el-form>
58 63 </template>
59 64  
60 65 <script>
61 66 import {getLogistics} from "@/api/office/logistics";
62 67 import {getDict} from "@/api/dict";
  68 +import {historyFromData} from "@/api/activiti/historyFormdata";
63 69 export default {
64 70 name: "logisticsInfo",
65 71 props: {
... ... @@ -74,7 +80,8 @@ export default {
74 80 return {
75 81 form: {},
76 82 type:null,
77   - depts:[]
  83 + depts:[],
  84 + hisfromData:[]
78 85 }
79 86 },
80 87 created() {
... ... @@ -89,6 +96,11 @@ export default {
89 96 getLogistics(this.idInfo).then(response => {
90 97 this.form = response.data
91 98 this.type = response.data.type;
  99 + historyFromData("logistics:" + this.idInfo).then(response => {
  100 + for(let i in response.data){
  101 + this.hisfromData.push(response.data[i]);
  102 + }
  103 + })
92 104 });
93 105 }
94 106 }
... ...
trash-workFlow/src/main/java/com/trash/office/listener/ConferenceEndListener.java
  View file @b11ba85
... ... @@ -31,28 +31,13 @@ public class ConferenceEndListener implements ExecutionListener {
31 31 if("1".equals(status)){
32 32 //设置为通过状态
33 33 conference.setStatus(1);
34   - //添加后勤管理（通过状态）
  34 + //修改后勤管理（通过状态）
35 35 conferenceMapper.updateConference(conference);
36 36 }else if("2".equals(status)){
37 37 //设置为驳回状态
38 38 conference.setStatus(2);
39   - //删除当前后勤管理
40   - conferenceMapper.deleteConferenceById(conference.getId());
41   - //添加后勤管理（驳回状态）
42   - conferenceMapper.insertConference(conference);
43   - //获取上传文件
44   - UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
45   - //查出旧的文件上传数据
46   - UploadFile uploadFile = new UploadFile();
47   - uploadFile.setTableName("conference");
48   - uploadFile.setTableNumber(id.toString());
49   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
50   - //添加请假申请（驳回状态）
51   - for (UploadFile uploadFile1 : list) {
52   - //将上传文件的表id 设置为新的请假申请id
53   - uploadFile1.setTableNumber(conference.getId().toString());
54   - uploadFileMapper.updateUploadFile(uploadFile1);
55   - }
  39 + //修改后勤管理（驳回状态）
  40 + conferenceMapper.updateConference(conference);
56 41 }
57 42 //流程历史存档
58 43 WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
... ...
trash-workFlow/src/main/java/com/trash/office/listener/HandleAffairsEndListener.java
  View file @b11ba85
... ... @@ -70,23 +70,8 @@ public class HandleAffairsEndListener implements ExecutionListener {
70 70 //信访部门重置为null
71 71 handleAffairs.setDeptId(null);
72 72 handleAffairs.setDeptName(null);
73   - //删除当前办文办事
74   - handleAffairsMapper.deleteHandleAffairsById(id);
75   - //添加办文办事（驳回状态）
76   - handleAffairsMapper.insertHandleAffairs(handleAffairs);
77   - //获取上传文件
78   - UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
79   - //查出旧的文件上传数据
80   - UploadFile uploadFile = new UploadFile();
81   - uploadFile.setTableName("handle_affairs");
82   - uploadFile.setTableNumber(id.toString());
83   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
84   - //添加请假申请（驳回状态）
85   - for (UploadFile uploadFile1 : list) {
86   - //将上传文件的表id 设置为新的请假申请id
87   - uploadFile1.setTableNumber(handleAffairs.getId().toString());
88   - uploadFileMapper.updateUploadFile(uploadFile1);
89   - }
  73 + //修改办文办事（驳回状态）
  74 + handleAffairsMapper.updateHandleAffairs(handleAffairs);
90 75 }else if ("3".equals(status)){
91 76 //将部门id，部门名称，意见设置为null
92 77 handleAffairs.setOpinion(null);
... ...
trash-workFlow/src/main/java/com/trash/office/listener/HandleAffairsTwoEndListener.java
  View file @b11ba85
... ... @@ -44,23 +44,7 @@ public class HandleAffairsTwoEndListener implements ExecutionListener {
44 44 //信访部门重置为null
45 45 handleAffairs.setDeptId(null);
46 46 handleAffairs.setDeptName(null);
47   - //删除当前办文办事
48   - handleAffairsMapper.deleteHandleAffairsById(id);
49   - //添加办文办事（驳回状态）
50   - handleAffairsMapper.insertHandleAffairs(handleAffairs);
51   - //获取上传文件
52   - UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
53   - //查出旧的文件上传数据
54   - UploadFile uploadFile = new UploadFile();
55   - uploadFile.setTableName("handle_affairs");
56   - uploadFile.setTableNumber(id.toString());
57   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
58   - //添加请假申请（驳回状态）
59   - for (UploadFile uploadFile1 : list) {
60   - //将上传文件的表id 设置为新的请假申请id
61   - uploadFile1.setTableNumber(handleAffairs.getId().toString());
62   - uploadFileMapper.updateUploadFile(uploadFile1);
63   - }
  47 + handleAffairsMapper.updateHandleAffairs(handleAffairs);
64 48 }
65 49 workflowUtils.sendDataToHisTory(delegateExecution,state);
66 50 }
... ...
trash-workFlow/src/main/java/com/trash/office/listener/LogisticsEndListener.java
  View file @b11ba85
... ... @@ -36,10 +36,8 @@ public class LogisticsEndListener implements ExecutionListener {
36 36 }else if("2".equals(status)){
37 37 //设置为驳回状态
38 38 logisticsManagement.setStatus(2);
39   - //删除当前后勤管理
40   - logisticsManagementMapper.deleteLogisticsManagementById(id);
41   - //添加后勤管理（驳回状态）
42   - logisticsManagementMapper.insertLogisticsManagement(logisticsManagement);
  39 + //修改当前后勤管理
  40 + logisticsManagementMapper.updateLogisticsManagement(logisticsManagement);
43 41 }
44 42 //流程历史存档
45 43 WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
... ...
trash-workFlow/src/main/java/com/trash/office/listener/leaveEndListener.java
  View file @b11ba85
... ... @@ -45,22 +45,8 @@ public class leaveEndListener implements ExecutionListener {
45 45 //设置为驳回状态
46 46 leaveApplication.setStatus(2);
47 47 //删除当前请假申请
48   - leaveApplicationMapper.deleteLeaveApplicationById(id);
  48 + leaveApplicationMapper.updateLeaveApplication(leaveApplication);
49 49  
50   - //获取上传文件
51   - UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
52   - //查出旧的文件上传数据
53   - UploadFile uploadFile = new UploadFile();
54   - uploadFile.setTableName("leave_application");
55   - uploadFile.setTableNumber(id.toString());
56   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
57   - //添加请假申请（驳回状态）
58   - leaveApplicationMapper.insertLeaveApplication(leaveApplication);
59   - for (UploadFile uploadFile1 : list) {
60   - //将上传文件的表id 设置为新的请假申请id
61   - uploadFile1.setTableNumber(leaveApplication.getId().toString());
62   - uploadFileMapper.updateUploadFile(uploadFile1);
63   - }
64 50 }
65 51  
66 52 WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
... ...
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
  View file @b11ba85
... ... @@ -4,6 +4,7 @@ import java.io.IOException;
4 4 import java.util.List;
5 5 import java.util.stream.Collectors;
6 6  
  7 +import com.trash.common.core.domain.entity.SysUser;
7 8 import com.trash.common.utils.DateUtils;
8 9 import com.trash.common.utils.SecurityUtils;
9 10 import com.trash.common.utils.file.FileUploadUtils;
... ... @@ -204,7 +205,8 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
204 205 * @param leaveApplication
205 206 */
206 207 public void initiatingProcess(LeaveApplication leaveApplication){
207   - List<String> roleIds = SecurityUtils.getLoginUser().getUser().getRoleIds();
  208 + SysUser sysUser = SecurityUtils.getLoginUser().getUser();
  209 + List<String> roleIds = sysUser.getPostIds();
208 210 Integer roleId = 0;
209 211 for (String role : roleIds){
210 212 //如果是角色id为3的则为部长或部长以上
... ...