youxiw2000 / trash · Commits

Commit 1cda9357d50ae77ad6c3568b42fa86329d4f3b6d

Authored by 273548560@qq.com
1 parent ab433b9d
build: skipped

修复bug

Inline Side-by-side
Showing 25 changed files with 380 additions and 148 deletions
trash-common/pom.xml
  View file @1cda935
... ... @@ -125,6 +125,13 @@
125 125 <version>[3.20.6.1,)</version>
126 126 </dependency>
127 127  
  128 + <!-- kafka -->
  129 + <dependency>
  130 + <groupId>org.springframework.kafka</groupId>
  131 + <artifactId>spring-kafka</artifactId>
  132 + <version>1.1.1.RELEASE</version>
  133 + </dependency>
  134 +
128 135 </dependencies>
129 136  
130 137 </project>
131 138 \ No newline at end of file
... ...
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
  View file @1cda935
... ... @@ -186,8 +186,7 @@ public class RemoteServerUtils {
186 186  
187 187 return array;
188 188 }
189   -
190   -
  189 +
191 190 public static JSONArray getTruckList(Map params){
192 191 JSONArray turckList=null;
193 192 Object object = post(TruckListRequestPath,params);
... ... @@ -532,10 +531,9 @@ public class RemoteServerUtils {
532 531 e.printStackTrace();
533 532 return null;
534 533 }
535   -
536   - return null;
537   - }
538 534  
  535 + return null;
  536 + }
539 537  
540 538  
541 539  
... ...
trash-quartz/pom.xml
  View file @1cda935
... ... @@ -43,12 +43,7 @@
43 43 <groupId>com.trash</groupId>
44 44 <artifactId>trash-workflow</artifactId>
45 45 </dependency>
46   -
47   - <dependency>
48   - <groupId>org.apache.kafka</groupId>
49   - <artifactId>kafka-clients</artifactId>
50   - <version>2.4.1</version>
51   - </dependency>
  46 +
52 47 </dependencies>
53 48  
54 49 </project>
55 50 \ No newline at end of file
... ...
trash-ui/src/views/business/ConstructionCredit/index.vue
  View file @1cda935
... ... @@ -25,7 +25,7 @@
25 25  
26 26 <el-col>
27 27 <el-form-item label="所属区域" prop="place">
28   - <el-select v-model="queryParams.place" filterable reserve-keyword placeholder="所属场地" size="small"
  28 + <el-select v-model="queryParams.place" filterable reserve-keyword placeholder="所属区域" size="small"
29 29 :loading="loading">
30 30 <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item">
31 31 </el-option>
... ...
trash-ui/src/views/business/EarthSitesCredit/index.vue
  View file @1cda935
... ... @@ -24,8 +24,8 @@
24 24 </el-col>
25 25  
26 26 <el-col>
27   - <el-form-item label="所属场地" prop="place">
28   - <el-select v-model="queryParams.place" filterable reserve-keyword placeholder="所属场地" size="small" >
  27 + <el-form-item label="所属区域" prop="place">
  28 + <el-select v-model="queryParams.place" filterable reserve-keyword placeholder="所属区域" size="small" >
29 29 <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item">
30 30 </el-option>
31 31 </el-select>
... ... @@ -34,8 +34,8 @@
34 34 </el-row>
35 35 <el-row type="flex" justify="center">
36 36 <el-col>
37   - <el-form-item label="垃圾类型" prop="type" style="float:right;">
38   - <el-select v-model="queryParams.type" filterable reserve-keyword placeholder="建筑垃圾类型" size="small"
  37 + <el-form-item label="消纳场类型" prop="type" style="float:right;">
  38 + <el-select v-model="queryParams.type" filterable reserve-keyword placeholder="消纳场类型" size="small"
39 39 :loading="loading">
40 40 <el-option v-for="item in dictTypes" :label="item" :value="item" :key="item">
41 41 </el-option>
... ...
trash-ui/src/views/h5/office/conference/index.vue
  View file @1cda935
... ... @@ -9,12 +9,12 @@
9 9 placeholder="选择会议时间">
10 10 </el-date-picker>
11 11 </el-form-item>
12   -<!-- <el-form-item label="发起部门" prop="deptId">-->
13   -<!-- <el-select v-model="queryParams.deptId" placeholder="请输入发起部门" style="width: 100%">-->
14   -<!-- <el-option label="全部" value=""/>-->
15   -<!-- <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>-->
16   -<!-- </el-select>-->
17   -<!-- </el-form-item>-->
  12 + <el-form-item label="发起部门" prop="deptName">
  13 + <el-select v-model="queryParams.deptName" placeholder="请输入发起部门" style="width: 100%">
  14 + <el-option label="全部" value=""/>
  15 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
  16 + </el-select>
  17 + </el-form-item>
18 18 <el-form-item label="会议地点" prop="conferenceSite">
19 19 <el-input v-model="queryParams.conferenceSite" placeholder="请输入会议地点"/>
20 20 </el-form-item>
... ... @@ -75,11 +75,7 @@
75 75 <el-table-column label="会议时间" align="center" prop="conferenceTime"/>
76 76 <el-table-column label="会议地点" align="center" prop="conferenceSite"/>
77 77 <el-table-column label="参会人员" align="center" prop="staff"/>
78   -<!-- <el-table-column label="发起部门" align="center" prop="deptId">-->
79   -<!-- <template slot-scope="scope">-->
80   -<!-- <span>{{ parseDept(scope.row.deptId) }}</span>-->
81   -<!-- </template>-->
82   -<!-- </el-table-column>-->
  78 + <el-table-column label="发起部门" align="center" prop="deptName"/>
83 79 <el-table-column label="审批状态" align="center">
84 80 <template slot-scope="scope">
85 81 <span>{{parseStatus(scope.row.status)}}</span>
... ... @@ -263,7 +259,7 @@ export default {
263 259 pageSize: 10,
264 260 conferenceTime: null,
265 261 conferenceSite: null,
266   - deptId: null,
  262 + deptName: null,
267 263 staff: null,
268 264 subject: null,
269 265 content: null,
... ... @@ -325,7 +321,7 @@ export default {
325 321 id: null,
326 322 conferenceTime: null,
327 323 conferenceSite: null,
328   - deptId: null,
  324 + deptName: null,
329 325 staff: null,
330 326 subject: null,
331 327 content: null,
... ... @@ -355,7 +351,7 @@ export default {
355 351 /** 查看按钮操作 */
356 352 handleInfo(row){
357 353 this.reset();
358   - this.idInfo = row.id;
  354 + this.idInfo = row.id+"";
359 355 this.title = "会议管理详情";
360 356 this.openInfo = true;
361 357 },
... ... @@ -509,14 +505,6 @@ export default {
509 505 a.setAttribute('target', '_blank')
510 506 a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
511 507 a.click()
512   - },
513   - parseDept(deptId){
514   - let dept = this.depts.filter(item=>{
515   - if(item.code == deptId){
516   - return item;
517   - }
518   - });
519   - return dept[0].name
520 508 }
521 509 }
522 510 };
... ...
trash-ui/src/views/h5/office/handle/handleInfo.vue
  View file @1cda935
... ... @@ -2,16 +2,16 @@
2 2 <el-form ref="form" :model="form" label-width="110px">
3 3 <el-form-item label="办文办事类型" prop="type">
4 4 <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%" :disabled="true">
5   - <el-option label="传阅学习类" value="0" />
6   - <el-option label="公文批办类" value="1" />
7   - <el-option label="热线举报类" value="2" />
8   - <el-option label="上级信访类" value="3" />
9   - <el-option label="现场信访类" value="4" />
  5 + <el-option label="传阅学习类" value="0"/>
  6 + <el-option label="公文批办类" value="1"/>
  7 + <el-option label="热线举报类" value="2"/>
  8 + <el-option label="上级信访类" value="3"/>
  9 + <el-option label="现场信访类" value="4"/>
10 10 </el-select>
11 11 </el-form-item>
12 12 <!-- 公文类 -->
13 13 <el-form-item label="来文单位" prop="company" v-if="form.type==0 || form.type==1">
14   - <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true" />
  14 + <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true"/>
15 15 </el-form-item>
16 16 <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
17 17 <el-date-picker size="small" style="width: 100%"
... ... @@ -23,11 +23,11 @@
23 23 </el-date-picker>
24 24 </el-form-item>
25 25 <el-form-item label="文件标题" prop="title" v-if="form.type==0 || form.type==1">
26   - <el-input v-model="form.title" placeholder="请输入文件标题" :disabled="true" />
  26 + <el-input v-model="form.title" placeholder="请输入文件标题" :disabled="true"/>
27 27 </el-form-item>
28 28 <!-- 信访类 -->
29 29 <el-form-item label="信访单位(人)" prop="sendPerson" v-if="form.type==2 || form.type==3|| form.type==4">
30   - <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true" />
  30 + <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true"/>
31 31 </el-form-item>
32 32 <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
33 33 <el-date-picker size="small" style="width: 100%"
... ... @@ -41,13 +41,54 @@
41 41 <el-form-item label="诉求" prop="appeal" v-if="form.type==2 || form.type==3|| form.type==4">
42 42 <el-input v-model="form.appeal" type="textarea" placeholder="请输入内容" :rows="6" :disabled="true"/>
43 43 </el-form-item>
44   - <!-- 意见处 -->
45   - <!-- <el-form-item label="办理意见" prop="opinion">-->
46   - <!-- <el-input v-model="form.opinion" placeholder="请输入办理意见" />-->
47   - <!-- </el-form-item>-->
48   - <!-- <el-form-item label="相关部门意见" prop="deptOpinion">-->
49   - <!-- <el-input v-model="form.deptOpinion" placeholder="请输入相关部门意见" />-->
50   - <!-- </el-form-item>-->
  44 + <el-form-item label="信访部门" prop="deptName"
  45 + v-if="((form.type==4 || form.type==2) && controlId=='FormProperty_214hj4h') ||
  46 + (form.type==3 && controlId=='FormProperty_2vu2250') ||
  47 + (form.deptName!=null && form.type!=1)">
  48 + <el-select ref="formDeptNameRef" v-model="form.deptId" placeholder="请选择信访部门" style="width: 100%"
  49 + :disabled="controlId!='FormProperty_2vu2250' && controlId!='FormProperty_214hj4h'">
  50 + <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  51 + </el-select>
  52 + </el-form-item>
  53 + <el-form-item label="意见" prop="appeal"
  54 + v-if="((form.type==4 || form.type==2) && controlId=='FormProperty_0orjdou') || (form.type==3 && controlId=='FormProperty_05v7lct') || form.opinion!=null">
  55 + <el-input type="textarea" v-model="form.opinion" :rows="4"
  56 + :disabled="controlId!='FormProperty_0orjdou' && controlId!='FormProperty_05v7lct'"/>
  57 + </el-form-item>
  58 + <el-form-item label="推送对象" v-if="controlId=='FormProperty_0aq22i0'">
  59 + <el-radio-group v-model="form.sendObject" :disabled="controlId!='FormProperty_0aq22i0'">
  60 + <el-radio :label="0">中心负责人</el-radio>
  61 + <el-radio :label="1">分管领导</el-radio>
  62 + </el-radio-group>
  63 + </el-form-item>
  64 + <el-form-item label="处理部门" prop="deptName" v-if="controlId=='FormProperty_11p96vq' || (businessKey=='gongwenchuli'&&form.type==1)">
  65 + <el-select ref="formDeptNameRef" v-model="form.deptId" placeholder="请选择处理部门" style="width: 100%"
  66 + :disabled="controlId!='FormProperty_11p96vq'">
  67 + <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  68 + </el-select>
  69 + </el-form-item>
  70 + <el-form-item label="办理意见" prop="opinion" v-if="controlId=='FormProperty_11p96vq'">
  71 + <el-input type="textarea" v-model="opinion" :rows="4" :disabled="controlId!='FormProperty_11p96vq'"/>
  72 + </el-form-item>
  73 + <el-form-item label="办理意见" prop="opinion"
  74 + v-if="form.type==1 && controlId!='FormProperty_11p96vq' && businessKey=='gongwenchuli'">
  75 + <el-input type="textarea" v-model="opinion1" :rows="4" :disabled="true"/>
  76 + </el-form-item>
  77 + <el-form-item label="回复意见" prop="opinion" v-if="controlId=='FormProperty_2jvcgq8'">
  78 + <el-input type="textarea" v-model="opinion" :rows="4" :disabled="controlId!='FormProperty_2jvcgq8'"/>
  79 + </el-form-item>
  80 + <el-form-item label="回复意见" prop="opinion"
  81 + v-if="form.type==1 && controlId!='FormProperty_2jvcgq8' && businessKey=='gongwenchuli' && controlId!='FormProperty_11p96vq'">
  82 + <el-input type="textarea" v-model="opinion2" :rows="4" :disabled="true"/>
  83 + </el-form-item>
  84 + <el-form-item label="阅览人" prop="userNames"
  85 + v-if="form.type==0 && businessKey=='yuelanxuexi1'">
  86 + <el-input v-model="form.userNames" :disabled="true"/>
  87 + </el-form-item>
  88 + <el-form-item label="已阅览人" prop="userNamesDone"
  89 + v-if="form.type==0 && businessKey=='yuelanxuexi1'">
  90 + <el-input v-model="form.userNamesDone" :disabled="true"/>
  91 + </el-form-item>
51 92 <el-row>
52 93 <el-table :data="fileEntityList">
53 94 <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
... ... @@ -70,32 +111,51 @@
70 111  
71 112 <script>
72 113 import {getHandle} from "@/api/office/handle";
  114 +import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
  115 +
73 116 export default {
74   - name: "contractInfo",
  117 + name: "handleInfo",
75 118 props: {
76 119 businessKey: {
77 120 type: String
78 121 },
79 122 idInfo: {
80   - type: Number
  123 + type: String
  124 + },
  125 + depts: {
  126 + type: Array
  127 + },
  128 + controlId: {
  129 + type: String
81 130 }
  131 +
82 132 },
83 133 data() {
84 134 return {
85 135 form: {},
86   - fileEntityList:[]
  136 + fileEntityList: [],
  137 + opinion: null,
  138 + opinion1: null,
  139 + opinion2: null,
87 140 }
88 141 },
89 142 created() {
90 143 this.init();
91 144 },
92   - methods:{
93   - init(){
  145 + methods: {
  146 + init() {
94 147 getHandle(this.idInfo).then(response => {
95 148 this.form = response.data.handleAffairs;
96 149 let files = JSON.stringify(response.data.uploadFiles);
97   - this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
  150 + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
98 151 });
  152 + listReplyApprovalProcess({tableName: 'handle_affairs', tableId: this.idInfo}).then(response => {
  153 + if(response.rows.length>0){
  154 + this.opinion1 = response.rows[0].reply;
  155 + this.opinion2 = response.rows[1].reply;
  156 + }
  157 + });
  158 +
99 159 },
100 160 /** 文件下载 */
101 161 downloadFA(row) {
... ...
trash-ui/src/views/h5/office/handle/index.vue
  View file @1cda935
... ... @@ -3,6 +3,7 @@
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
4 4 <el-form-item label="办文办事类型" prop="type">
5 5 <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" size="small">
  6 + <el-option label="全部" value=""/>
6 7 <el-option label="传阅学习类" value="0" />
7 8 <el-option label="公文批办类" value="1" />
8 9 <el-option label="热线举报类" value="2" />
... ... @@ -14,9 +15,9 @@
14 15 <el-input
15 16 v-model="queryParams.company"
16 17 placeholder="请输入来文单位"
17   -
  18 +
18 19 size="small"
19   -
  20 +
20 21 />
21 22 </el-form-item>
22 23 <el-form-item label="收文时间" prop="receiveTime">
... ... @@ -31,18 +32,18 @@
31 32 <el-input
32 33 v-model="queryParams.title"
33 34 placeholder="请输入文件标题"
34   -
  35 + clearable
35 36 size="small"
36   -
  37 +
37 38 />
38 39 </el-form-item>
39 40 <el-form-item label="信访单位(人)" prop="sendPerson">
40 41 <el-input
41 42 v-model="queryParams.sendPerson"
42 43 placeholder="请输入信访单位(人)"
43   -
  44 +
44 45 size="small"
45   -
  46 +
46 47 />
47 48 </el-form-item>
48 49 <el-form-item label="信访日期" prop="sendDate">
... ... @@ -124,7 +125,7 @@
124 125 </el-table-column>
125 126 <el-table-column label="审批状态" align="center" prop="status">
126 127 <template slot-scope="scope">
127   - <span>{{parseStatus(scope.row.status)}}</span>
  128 + <span>{{parseStatusz(scope.row.status)}}</span>
128 129 </template>
129 130 </el-table-column>
130 131 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
... ... @@ -132,7 +133,7 @@
132 133 <el-button
133 134 size="mini"
134 135 type="text"
135   - icon="el-icon-edit"
  136 + icon="el-icon-view"
136 137 @click="handleInfo(scope.row)"
137 138 v-hasPermi="['office:handle:edit']"
138 139 >详情</el-button>
... ... @@ -260,7 +261,7 @@
260 261 </div>
261 262 </el-dialog>
262 263 <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body>
263   - <handleInfo :idInfo="idInfo" v-if="openInfo"/>
  264 + <handleInfo :idInfo="idInfo" v-if="openInfo" :businessKey="businessKey" :depts="depts"/>
264 265 <div slot="footer" class="dialog-footer">
265 266 <el-button @click="cancel">取 消</el-button>
266 267 </div>
... ... @@ -271,6 +272,7 @@
271 272 <script>
272 273 import { listHandle, getHandle, delHandle, addHandle, updateHandle, exportHandle } from "@/api/office/handle";
273 274 import handleInfo from "./handleInfo";
  275 +import {getDict} from "@/api/dict";
274 276 export default {
275 277 name: "Handle",
276 278 components: { handleInfo },
... ... @@ -331,9 +333,15 @@ export default {
331 333 fileEntityList: [],
332 334 idInfo: null,
333 335 openInfo: false,
  336 + businessKey:null,
  337 + depts:[],
334 338 };
335 339 },
336 340 created() {
  341 + let dep = {type:"CSUserDepartmentType"};
  342 + getDict(dep).then(res=>{
  343 + this.depts = res.result;
  344 + });
337 345 this.getList();
338 346 },
339 347 methods: {
... ... @@ -350,6 +358,7 @@ export default {
350 358 cancel() {
351 359 this.open = false;
352 360 this.openInfo = false;
  361 + this.businessKey = null;
353 362 this.reset();
354 363 },
355 364 // 表单重置
... ... @@ -394,9 +403,16 @@ export default {
394 403 },
395 404 /** 查看详情 */
396 405 handleInfo(row){
397   - this.idInfo = row.id;
  406 + this.idInfo = row.id+"";
398 407 this.openInfo = true;
399 408 this.title = "办文办事详情";
  409 +
  410 + console.log(row.type);
  411 + if(row.type==0){
  412 + this.businessKey = 'yuelanxuexi1';
  413 + }else if(row.type==1){
  414 + this.businessKey = 'gongwenchuli';
  415 + }
400 416 },
401 417 /** 修改按钮操作 */
402 418 handleUpdate(row) {
... ... @@ -576,6 +592,17 @@ export default {
576 592 this.rules.sendDate[0].required = true;
577 593 this.rules.appeal[0].required = true;
578 594 }
  595 + },
  596 + parseStatusz(status) {
  597 + if(status==1){
  598 + return "审批通过";
  599 + }else if(status==2){
  600 + return "审批驳回";
  601 + }else if(status==3){
  602 + return "收文完成";
  603 + }else{
  604 + return "审批中";
  605 + }
579 606 }
580 607 }
581 608 };
... ...
trash-ui/src/views/h5/office/leaveApplication/index.vue
  View file @1cda935
... ... @@ -5,9 +5,9 @@
5 5 <el-input
6 6 v-model="queryParams.applicant"
7 7 placeholder="请输入申请人"
8   -
  8 +
9 9 size="small"
10   -
  10 +
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="申请部门" prop="deptId">
... ... @@ -115,6 +115,7 @@
115 115 type="text"
116 116 icon="el-icon-edit"
117 117 @click="handleUpdate(scope.row)"
  118 + v-if="scope.row.status==2"
118 119 v-hasPermi="['office:leaveApplication:edit']"
119 120 >修改
120 121 </el-button>
... ... @@ -139,7 +140,7 @@
139 140 />
140 141  
141 142 <!-- 添加或修改请假申请对话框 -->
142   - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
  143 + <el-dialog :title="title" :visible.sync="open" width="300px" append-to-body :close-on-click-modal="false">
143 144 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
144 145  
145 146 <el-form-item label="联系方式" prop="phone">
... ... @@ -244,6 +245,7 @@ import {
244 245 } from "@/api/office/leaveApplication";
245 246 import Editor from '@/components/ZcEditor';
246 247 import leaveApplicationInfo from './leaveApplicationInfo';
  248 +import {getDict} from "@/api/dict";
247 249  
248 250 export default {
249 251 name: "LeaveApplication",
... ... @@ -273,7 +275,7 @@ export default {
273 275 pageNum: 1,
274 276 pageSize: 10,
275 277 applicant: null,
276   - deptId: null,
  278 + deptName: null,
277 279 positionId: null,
278 280 birthdate: null,
279 281 phone: null,
... ... @@ -318,9 +320,14 @@ export default {
318 320 openInfo: false,
319 321 idInfo: null,
320 322 fileEntityList:[],
  323 + depts:[]
321 324 };
322 325 },
323 326 created() {
  327 + let dep = {type:"CSUserDepartmentType"};
  328 + getDict(dep).then(res=>{
  329 + this.depts = res.result;
  330 + });
324 331 this.getList();
325 332 },
326 333 methods: {
... ... @@ -345,7 +352,7 @@ export default {
345 352 this.form = {
346 353 id: null,
347 354 applicant: null,
348   - deptId: null,
  355 + deptName: null,
349 356 positionId: null,
350 357 workDate: null,
351 358 birthdate: null,
... ... @@ -382,7 +389,7 @@ export default {
382 389 /** 查看按钮操作 */
383 390 handleInfo(row) {
384 391 this.reset();
385   - this.idInfo = row.id;
  392 + this.idInfo = row.id+"";
386 393 this.title = "请假申请详情";
387 394 this.openInfo = true;
388 395 },
... ...
trash-ui/src/views/h5/office/logistics/index.vue
  View file @1cda935
1 1 <template>
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4   - <el-form-item label="申请部门" prop="deptId">
5   - <el-select v-model="queryParams.deptId" placeholder="请输入申请部门" style="width: 100%">
  4 + <el-form-item label="申请部门" prop="deptName">
  5 + <el-select v-model="queryParams.deptName" placeholder="请输入申请部门" style="width: 100%">
6 6 <el-option label="全部" value=""/>
7   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  7 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
8 8 </el-select>
9 9 </el-form-item>
10 10 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
... ... @@ -18,9 +18,9 @@
18 18 <el-input
19 19 v-model="queryParams.staff"
20 20 placeholder="请输入申请人"
21   -
  21 +
22 22 size="small"
23   -
  23 +
24 24 />
25 25 </el-form-item>
26 26 <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0">
... ... @@ -35,9 +35,9 @@
35 35 <el-input
36 36 v-model="queryParams.goodsName"
37 37 placeholder="请输入物品名称"
38   -
  38 +
39 39 size="small"
40   -
  40 +
41 41 />
42 42 </el-form-item>
43 43 <el-form-item>
... ... @@ -93,11 +93,7 @@
93 93  
94 94 <el-table v-loading="loading" :data="logisticsList" @selection-change="handleSelectionChange">
95 95 <el-table-column type="selection" width="55" align="center"/>
96   - <el-table-column label="申请部门" align="center" prop="deptId">
97   - <template slot-scope="scope">
98   - <span>{{ parseDept(scope.row.deptId) }}</span>
99   - </template>
100   - </el-table-column>
  96 + <el-table-column label="申请部门" align="center" prop="deptName"/>
101 97 <!-- 用章申请 -->
102 98 <el-table-column label="用章类型" align="center" prop="sealType" v-if="type==0"/>
103 99 <el-table-column label="更新时间" align="center" prop="sealUpdateTime" width="180" v-if="type==0">
... ... @@ -167,9 +163,9 @@
167 163 <!-- 添加或修改后勤管理对话框 -->
168 164 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
169 165 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
170   - <el-form-item label="申请部门" prop="deptId">
171   - <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%">
172   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  166 + <el-form-item label="申请部门" prop="deptName">
  167 + <el-select v-model="form.deptName" placeholder="请输入申请部门" style="width: 100%">
  168 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
173 169 </el-select>
174 170 </el-form-item>
175 171 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
... ... @@ -279,7 +275,7 @@ export default {
279 275 pageNum: 1,
280 276 pageSize: 10,
281 277 type: this.type,
282   - deptId: null,
  278 + deptName: null,
283 279 sealType: null,
284 280 staff: null,
285 281 useDate: null,
... ... @@ -289,7 +285,7 @@ export default {
289 285 form: {},
290 286 // 表单校验
291 287 rules: {
292   - deptId: [
  288 + deptName: [
293 289 {required: true, message: "必填", trigger: "blur"}
294 290 ],
295 291 sealType: [
... ... @@ -348,7 +344,7 @@ export default {
348 344 // 表单重置
349 345 reset() {
350 346 this.form = {
351   - deptId: null,
  347 + deptName: null,
352 348 sealType: null,
353 349 sealUpdateTime: null,
354 350 sealEndTime: null,
... ... @@ -390,7 +386,7 @@ export default {
390 386 },
391 387 /** 查看按钮操作 */
392 388 handleInfo(row) {
393   - this.idInfo = row.id;
  389 + this.idInfo = row.id+"";
394 390 this.openInfo = true;
395 391 this.title = "查看后勤管理";
396 392 },
... ... @@ -480,14 +476,6 @@ export default {
480 476 this.rules.goodsName[0].required = true;
481 477 this.rules.quantity[0].required = true;
482 478 }
483   - },
484   - parseDept(deptId){
485   - let dept = this.depts.filter(item=>{
486   - if(item.code == deptId){
487   - return item;
488   - }
489   - });
490   - return dept[0].name
491 479 }
492 480 }
493 481 };
... ...
trash-ui/src/views/h5/office/logistics/logisticsInfo.vue
  View file @1cda935
... ... @@ -2,7 +2,7 @@
2 2 <el-form ref="form" :model="form" label-width="80px">
3 3 <el-form-item label="申请部门" prop="deptId">
4 4 <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%" :disabled="true">
5   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  5 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
6 6 </el-select>
7 7 </el-form-item>
8 8 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
... ... @@ -67,7 +67,7 @@ export default {
67 67 type: String
68 68 },
69 69 idInfo: {
70   - type: Number
  70 + type: String
71 71 }
72 72 },
73 73 data() {
... ...
trash-ui/src/views/h5/office/management/index.vue
  View file @1cda935
... ... @@ -5,9 +5,9 @@
5 5 <el-input
6 6 v-model="queryParams.contractName"
7 7 placeholder="请输入合同名称"
8   -
  8 +
9 9 size="small"
10   -
  10 +
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="合同状态" prop="contractState">
... ... @@ -420,7 +420,7 @@ export default {
420 420 /** 查看按钮操作 */
421 421 handleInfo(row){
422 422 this.reset();
423   - this.idInfo = row.id;
  423 + this.idInfo = row.id+"";
424 424 this.title = "请假申请详情";
425 425 this.openInfo = true;
426 426 },
... ...
trash-ui/src/views/office/conference/index.vue
  View file @1cda935
... ... @@ -351,7 +351,7 @@ export default {
351 351 /** 查看按钮操作 */
352 352 handleInfo(row){
353 353 this.reset();
354   - this.idInfo = row.id;
  354 + this.idInfo = row.id+"";
355 355 this.title = "会议管理详情";
356 356 this.openInfo = true;
357 357 },
... ...
trash-ui/src/views/office/handle/handleInfo.vue
  View file @1cda935
... ... @@ -120,6 +120,7 @@ export default {
120 120 type: String
121 121 },
122 122 idInfo: {
  123 + type: String
123 124 },
124 125 depts: {
125 126 type: Array
... ...
trash-ui/src/views/office/handle/index.vue
  View file @1cda935
... ... @@ -15,9 +15,9 @@
15 15 <el-input
16 16 v-model="queryParams.company"
17 17 placeholder="请输入来文单位"
18   -
  18 +
19 19 size="small"
20   -
  20 +
21 21 />
22 22 </el-form-item>
23 23 <el-form-item label="收文时间" prop="receiveTime">
... ... @@ -32,18 +32,18 @@
32 32 <el-input
33 33 v-model="queryParams.title"
34 34 placeholder="请输入文件标题"
35   -
  35 +
36 36 size="small"
37   -
  37 +
38 38 />
39 39 </el-form-item>
40 40 <el-form-item label="信访单位(人)" prop="sendPerson">
41 41 <el-input
42 42 v-model="queryParams.sendPerson"
43 43 placeholder="请输入信访单位(人)"
44   -
  44 +
45 45 size="small"
46   -
  46 +
47 47 />
48 48 </el-form-item>
49 49 <el-form-item label="信访日期" prop="sendDate">
... ... @@ -403,7 +403,7 @@ export default {
403 403 },
404 404 /** 查看详情 */
405 405 handleInfo(row){
406   - this.idInfo = row.id;
  406 + this.idInfo = row.id+"";
407 407 this.openInfo = true;
408 408 this.title = "办文办事详情";
409 409  
... ...
trash-ui/src/views/office/leaveApplication/index.vue
  View file @1cda935
... ... @@ -5,9 +5,9 @@
5 5 <el-input
6 6 v-model="queryParams.applicant"
7 7 placeholder="请输入申请人"
8   -
  8 +
9 9 size="small"
10   -
  10 +
11 11 />
12 12 </el-form-item>
13 13 <!-- <el-form-item label="申请部门" prop="deptName">-->
... ... @@ -390,7 +390,7 @@ export default {
390 390 /** 查看按钮操作 */
391 391 handleInfo(row) {
392 392 this.reset();
393   - this.idInfo = row.id;
  393 + this.idInfo = row.id+"";
394 394 this.title = "请假申请详情";
395 395 this.openInfo = true;
396 396 },
... ...
trash-ui/src/views/office/logistics/index.vue
  View file @1cda935
... ... @@ -18,9 +18,9 @@
18 18 <el-input
19 19 v-model="queryParams.staff"
20 20 placeholder="请输入申请人"
21   -
  21 +
22 22 size="small"
23   -
  23 +
24 24 />
25 25 </el-form-item>
26 26 <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0">
... ... @@ -35,9 +35,9 @@
35 35 <el-input
36 36 v-model="queryParams.goodsName"
37 37 placeholder="请输入物品名称"
38   -
  38 +
39 39 size="small"
40   -
  40 +
41 41 />
42 42 </el-form-item>
43 43 <el-form-item>
... ... @@ -386,7 +386,7 @@ export default {
386 386 },
387 387 /** 查看按钮操作 */
388 388 handleInfo(row) {
389   - this.idInfo = row.id;
  389 + this.idInfo = row.id+"";
390 390 this.openInfo = true;
391 391 this.title = "查看后勤管理";
392 392 },
... ...
trash-ui/src/views/office/logistics/logisticsInfo.vue
  View file @1cda935
... ... @@ -67,7 +67,7 @@ export default {
67 67 type: String
68 68 },
69 69 idInfo: {
70   - type: Number
  70 + type: String
71 71 }
72 72 },
73 73 data() {
... ...
trash-ui/src/views/office/management/index.vue
  View file @1cda935
... ... @@ -5,9 +5,9 @@
5 5 <el-input
6 6 v-model="queryParams.contractName"
7 7 placeholder="请输入合同名称"
8   -
  8 +
9 9 size="small"
10   -
  10 +
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="合同状态" prop="contractState">
... ... @@ -420,7 +420,7 @@ export default {
420 420 /** 查看按钮操作 */
421 421 handleInfo(row){
422 422 this.reset();
423   - this.idInfo = row.id;
  423 + this.idInfo = row.id+"";
424 424 this.title = "请假申请详情";
425 425 this.openInfo = true;
426 426 },
... ...
trash-workFlow/src/main/java/com/trash/business/domain/CompanyCredit.java
  View file @1cda935
... ... @@ -24,15 +24,16 @@ public class CompanyCredit extends BaseEntity
24 24 @Excel(name = "运输企业")
25 25 private String name;
26 26  
27   - /** 失信时间 */
28   - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
29   - @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
30   - private Date time;
31 27  
32 28 /** 所属区域 */
33 29 @Excel(name = "所属区域")
34 30 private String place;
35 31  
  32 + /** 失信时间 */
  33 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  34 + @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
  35 + private Date time;
  36 +
36 37 /** 失信原因 */
37 38 @Excel(name = "失信原因")
38 39 private String reason;
... ...
trash-workFlow/src/main/java/com/trash/business/domain/TruckCredit.java
  View file @1cda935
... ... @@ -30,10 +30,13 @@ public class TruckCredit extends BaseEntity
30 30 @Excel(name = "车牌号码")
31 31 private String licensePlate;
32 32  
  33 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  34 + @Excel(name = "失信时间", dateFormat = "yyyy-MM-dd")
  35 + private Date time;
  36 +
33 37 /** 失信原因 */
34 38 @Excel(name = "失信原因")
35 39 private String reason;
36   -
37 40 /** 0当前 1历史 */
38 41 private Long status;
39 42  
... ... @@ -46,10 +49,6 @@ public class TruckCredit extends BaseEntity
46 49  
47 50 private Long createType;
48 51  
49   - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
50   - @Excel(name = "${失信时间}", dateFormat = "yyyy-MM-dd")
51   - private Date time;
52   -
53 52  
54 53 public String getLicensePlate() {
55 54 return licensePlate;
... ...
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java 0 → 100644
  View file @1cda935
  1 +package com.trash.casefile.kafka;
  2 +
  3 +import com.alibaba.fastjson.JSONArray;
  4 +import com.alibaba.fastjson.JSONObject;
  5 +import com.trash.casefile.domain.ViolationWarningInformation;
  6 +import com.trash.casefile.service.IViolationWarningInformationService;
  7 +import com.trash.common.config.trashConfig;
  8 +import com.trash.common.utils.DateUtils;
  9 +import com.trash.common.utils.RemoteServerUtils;
  10 +import com.trash.common.utils.StringUtils;
  11 +import com.trash.framework.web.service.SysLoginService;
  12 +import org.apache.commons.lang3.time.DateFormatUtils;
  13 +import org.slf4j.Logger;
  14 +import org.slf4j.LoggerFactory;
  15 +import org.springframework.beans.factory.annotation.Autowired;
  16 +import org.springframework.kafka.annotation.KafkaListener;
  17 +import org.springframework.kafka.support.KafkaHeaders;
  18 +import org.springframework.messaging.handler.annotation.Header;
  19 +import org.springframework.messaging.handler.annotation.Payload;
  20 +import org.springframework.stereotype.Component;
  21 +
  22 +import java.io.IOException;
  23 +import java.util.ArrayList;
  24 +import java.util.Date;
  25 +import java.util.List;
  26 +import java.util.Map;
  27 +
  28 +@Component
  29 +public class Consumer {
  30 + private static final Logger log = LoggerFactory.getLogger(Consumer.class);
  31 +
  32 + @Autowired
  33 + private IViolationWarningInformationService violationWarningInformationService;
  34 +
  35 + @KafkaListener(topics="record_process_alarm")
  36 + public void consume(@Payload String data) {
  37 + log.info("kafka消费数据成功,data:" + data);
  38 + autoViolationWarning(data);
  39 + }
  40 +
  41 + @Autowired
  42 + trashConfig trashConfig;
  43 +
  44 + @Autowired
  45 + SysLoginService loginService;
  46 +
  47 + public void autoViolationWarning(String data) {
  48 +// String[] code = {"44030020=工地预警-未报开工作业","44030021=工地预警-视频设备离线超时报警","44030022=工地预警-三无车辆进入工地","44030023=工地预警未按时间作业",
  49 +// "44030024=消纳场预警-未报开工作业","44030025=消纳场预警-视频设备离线超时报警","44030026=消纳场预警-三无车辆进入消纳场","44030027=消纳场预警-未到指定的消纳场作业",
  50 +// "44030028=离线运输报警(工)","44030029=离线运输报警(消)","44030030=未激活车辆作业","44030031=未核准作业车辆作业","44030032=未按线路行驶",
  51 +// "44030033=闯禁行驶","44030034=失信车辆作业"};
  52 +// JSONObject jsonObject = JSONObject.parseObject(data);
  53 +// ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
  54 +// String siteType = jsonObject.getString("siteType");
  55 +//
  56 +//
  57 +// if(StringUtils.isEmpty(RemoteServerUtils.remote)){
  58 +// RemoteServerUtils.remote = trashConfig.getRemotePath();
  59 +// }
  60 +// loginService.loginByRemote(trashConfig.getToken());
  61 +// JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
  62 +// if("1".equals(siteType)){//工地
  63 +// violationWarningInformation.setViolationObjectType("0");
  64 +// JSONObject object = RemoteServerUtils.getConstructionInfo(jsonObject.getString("siteId"),trashConfig.getToken());
  65 +// String areaCode = object.get("areaCode").toString();
  66 +// for(Object areasObject:jsonArray){
  67 +// JSONObject areas = (JSONObject) areasObject;
  68 +// if(areaCode.equals(areas.getString("code"))){
  69 +// violationWarningInformation.setOwningRegion(areas.getString("name"));
  70 +// break;
  71 +// }
  72 +// }
  73 +// }else if("2".equals(siteType)){//消纳场
  74 +// violationWarningInformation.setViolationObjectType("1");
  75 +// JSONObject object = RemoteServerUtils.getEarthSitesInfo(jsonObject.getString("siteId"),trashConfig.getToken());
  76 +// String areaCode = object.get("areaCode").toString();
  77 +// for(Object areasObject:jsonArray){
  78 +// JSONObject areas = (JSONObject) areasObject;
  79 +// if(areaCode.equals(areas.getString("code"))){
  80 +// violationWarningInformation.setOwningRegion(areas.getString("name"));
  81 +// break;
  82 +// }
  83 +// }
  84 +// }
  85 +// String number = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
  86 +// violationWarningInformation.setNumber(number.substring(2, number.length()));
  87 +// violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
  88 +// String violationTypeCode = jsonObject.getString("alarmType");
  89 +// for (int i = 0; i < code.length; i++) {
  90 +// if (violationTypeCode.equals(code[i].split("=")[0])) {
  91 +// violationWarningInformation.setViolationType(code[i].split("=")[1]);
  92 +// break;
  93 +// }
  94 +// }
  95 +// //发送人
  96 +// violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
  97 +// //推送对象
  98 +// violationWarningInformation.setViolationGrade("一般类");
  99 +// switch (violationWarningInformation.getViolationType()){
  100 +// case "工地预警-未报开工作业":
  101 +// case "消纳场预警-未到指定的消纳场作业":
  102 +// case "消纳场预警-三无车辆进入消纳场":
  103 +// case "消纳场预警-未报开工作业":
  104 +// case "工地预警未按时间作业":
  105 +// case "工地预警-三无车辆进入工地":
  106 +// case "工地预警-视频设备离线超时报警":
  107 +// case "离线运输报警(消)":
  108 +// case "离线运输报警(工)":
  109 +// case "未激活车辆作业":
  110 +// case "未核准作业车辆作业":
  111 +// violationWarningInformation.setSendObject("区管理部门(治)");
  112 +// break;
  113 +// case "消纳场预警-视频设备离线超时报警":
  114 +// violationWarningInformation.setSendObject("区管理部门(消)");
  115 +// break;
  116 +// case "未按线路行驶":
  117 +// violationWarningInformation.setViolationGrade("重点类");
  118 +// violationWarningInformation.setSendObject("区管理部门(治)");
  119 +// break;
  120 +// case "闯禁行驶":
  121 +// case "失信车辆作业":
  122 +// violationWarningInformation.setSendObject("运输企业");
  123 +// violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
  124 +// break;
  125 +// }
  126 +//
  127 +// // 业务逻辑
  128 +// try {
  129 +// violationWarningInformationService.insertViolationWarningInformation(null,violationWarningInformation);
  130 +// } catch (IOException e) {
  131 +// e.printStackTrace();
  132 +// }
  133 +
  134 +
  135 + }
  136 +}
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
  View file @1cda935
... ... @@ -8,6 +8,7 @@ import com.trash.casefile.domain.ViolationCaseFile;
8 8 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
9 9 import com.trash.common.utils.DateUtils;
10 10 import com.trash.common.utils.SecurityUtils;
  11 +import com.trash.common.utils.StringUtils;
11 12 import com.trash.common.utils.file.FileUploadUtils;
12 13 import com.trash.office.domain.LeaveApplication;
13 14 import com.trash.office.domain.UploadFile;
... ... @@ -78,18 +79,22 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
78 79 @Override
79 80 @Transactional
80 81 public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
81   - violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
  82 + if(StringUtils.isEmpty(violationWarningInformation.getCreateBy())){
  83 + violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
  84 + }
82 85 violationWarningInformation.setCreateTime(DateUtils.getNowDate());
83 86 violationWarningInformation.setStatus(0);
84 87 Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation);
85   - //文件上传
86   - for (MultipartFile file : files) {
87   - UploadFile uploadFile = new UploadFile();
88   - uploadFile.setTableName("violation_warning_information");
89   - uploadFile.setTableNumber(violationWarningInformation.getId().toString());
90   - uploadFile.setFileName(file.getOriginalFilename());
91   - uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
92   - uploadFileMapper.insertUploadFile(uploadFile);
  88 + if(StringUtils.isNotEmpty(files)){
  89 + //文件上传
  90 + for (MultipartFile file : files) {
  91 + UploadFile uploadFile = new UploadFile();
  92 + uploadFile.setTableName("violation_warning_information");
  93 + uploadFile.setTableNumber(violationWarningInformation.getId().toString());
  94 + uploadFile.setFileName(file.getOriginalFilename());
  95 + uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
  96 + uploadFileMapper.insertUploadFile(uploadFile);
  97 + }
93 98 }
94 99 int i = 0;
95 100  
... ... @@ -105,7 +110,12 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
105 110 }
106 111  
107 112  
108   - WorkflowService.createCaseFile1(violationWarningInformation,i);
  113 + if(violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")){
  114 + WorkflowService.createCaseFile1(violationWarningInformation,i,1);
  115 + }else{
  116 + WorkflowService.createCaseFile1(violationWarningInformation,i,0);
  117 + }
  118 +
109 119 return result;
110 120 }
111 121  
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
  View file @1cda935
... ... @@ -94,5 +94,5 @@ public interface IWorkflowService
94 94  
95 95 int createCaseFile(ViolationCaseFile violationCaseFile,int index);
96 96  
97   - int createCaseFile1(ViolationWarningInformation violationCaseFile, int index);
  97 + int createCaseFile1(ViolationWarningInformation violationCaseFile, int index,int isAuto);
98 98 }
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @1cda935
... ... @@ -6,6 +6,8 @@ import java.util.Map;
6 6 import java.util.stream.Collectors;
7 7  
8 8 import com.trash.casefile.domain.ViolationWarningInformation;
  9 +import com.trash.common.config.trashConfig;
  10 +import com.trash.framework.web.service.SysLoginService;
9 11 import org.activiti.api.process.model.ProcessInstance;
10 12 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
11 13 import org.activiti.api.process.runtime.ProcessRuntime;
... ... @@ -57,6 +59,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
57 59 @Autowired
58 60 private TaskRuntime taskRuntime;
59 61  
  62 +
  63 + @Autowired
  64 + com.trash.common.config.trashConfig trashConfig;
  65 +
  66 + @Autowired
  67 + SysLoginService loginService;
  68 +
60 69 String siteType[] = { "消纳场", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急消纳场", "回填场" };
61 70  
62 71 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
... ... @@ -253,7 +262,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
253 262  
254 263 @Override
255 264 @Transactional
256   - public int createCaseFile1(ViolationWarningInformation caseFile, int index){ //违规预警案卷
  265 + public int createCaseFile1(ViolationWarningInformation caseFile, int index,int isAuto){ //违规预警案卷
  266 + if(isAuto==1){
  267 + if(StringUtils.isEmpty(RemoteServerUtils.remote)){
  268 + RemoteServerUtils.remote = trashConfig.getRemotePath();
  269 + }
  270 + loginService.loginByRemote(trashConfig.getToken());
  271 + }
257 272 ProcessInstance processInstance = null;
258 273 String title = "案卷号:" + caseFile.getNumber();
259 274 String flowType = "violation_warning";
... ...