youxiw2000 / trash · Commits

Commit 9d60e0e6eb64f75763bc0fdcc279f6ca18c72936

Authored by youxiw2000
1 parent e1e1df2f

m

Inline Side-by-side
Showing 51 changed files with 726 additions and 445 deletions
trash-admin/src/main/java/com/trash/Application.java
  View file @9d60e0e
... ... @@ -3,6 +3,10 @@ package com.trash;
3 3 import org.springframework.boot.SpringApplication;
4 4 import org.springframework.boot.autoconfigure.SpringBootApplication;
5 5 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  6 +import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
  7 +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
  8 +import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
  9 +import org.springframework.context.annotation.Bean;
6 10 import org.springframework.scheduling.annotation.EnableScheduling;
7 11  
8 12 /**
... ... @@ -16,8 +20,15 @@ public class Application
16 20 {
17 21 public static void main(String[] args)
18 22 {
19   - // System.setProperty("spring.devtools.restart.enabled", "false");
  23 + System.setProperty("spring.devtools.restart.enabled", "true");
20 24 SpringApplication.run(Application.class, args);
21 25 System.out.println("Application start success");
22 26 }
  27 +
  28 + @Bean
  29 + public ConfigurableServletWebServerFactory webServerFactory() {
  30 + TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
  31 + factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]\\"));
  32 + return factory;
  33 + }
23 34 }
... ...
trash-admin/src/main/resources/application-dev.yml
  View file @9d60e0e
... ... @@ -9,8 +9,8 @@ trash:
9 9 # 实例演示开关
10 10 demoEnabled: true
11 11 # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
12   - profile: /home/trash/uploadPath
13   -# profile: E:/trash/uploadPath
  12 + #profile: /home/trash/uploadPath
  13 + profile: E:/trash/uploadPath
14 14 # profile: F:/work/project/Documents/uploadPath/trash
15 15 # 获取ip地址开关
16 16 addressEnabled: false
... ...
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @9d60e0e
... ... @@ -94,7 +94,7 @@ public class GarbageOrderController {
94 94 // 上传并返回新文件名称
95 95 fileName = FileUploadUtils.upload(filePath, file);
96 96 } catch (IOException e) {
97   - log.error("上传图片异常",e);
  97 +// log.error("上传图片异常",e);
98 98 throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
99 99 }
100 100 String url = serverConfig.getUrl() + fileName;
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
  View file @9d60e0e
... ... @@ -55,7 +55,23 @@ public class GarOrderCar implements Serializable {
55 55 @TableField(fill = FieldFill.INSERT)
56 56 private String garCreateBy;
57 57  
58   - /**
  58 + public Integer getCarId() {
  59 + return carId;
  60 + }
  61 +
  62 + public void setCarId(Integer carId) {
  63 + this.carId = carId;
  64 + }
  65 +
  66 + public String getContainerVolume() {
  67 + return containerVolume;
  68 + }
  69 +
  70 + public void setContainerVolume(String containerVolume) {
  71 + this.containerVolume = containerVolume;
  72 + }
  73 +
  74 + /**
59 75 *
60 76 */
61 77 @TableField(fill = FieldFill.INSERT_UPDATE)
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
  View file @9d60e0e
... ... @@ -107,6 +107,8 @@ public class OrderDto {
107 107 private String garOrderCarType;
108 108  
109 109 private String containerVolume;
  110 +
  111 +
110 112  
111 113 public Integer getGarOrderCarNumber() {
112 114 return garOrderCarNumber;
... ...
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @9d60e0e
... ... @@ -728,8 +728,8 @@ public class DriverTask {
728 728 CompanyCredit companyCredit = new CompanyCredit();
729 729 companyCredit.setTime(new Date());
730 730 companyCredit.setCreateBy("长沙市建筑垃圾智慧监管平台");
731   - companyCredit.setReason("企业道路运输经营许可证有效期:" + company.getString("businessLicenseValidTime")
732   - + " 企业营业执照有效期:" + company.getString("registrationValidTime") + ",证件过期");
  731 + companyCredit.setReason("企业道路运输经营许可证有效期:" + company.getString("registrationValidTime")
  732 + + " 企业营业执照有效期:" + company.getString("businessLicenseValidTime") + ",证件过期");
733 733 companyCredit.setLostCredit(1L);
734 734 companyCredit.setObjectId(company.getString("id"));
735 735 companyCredit.setName(company.getString("name"));
... ... @@ -828,7 +828,14 @@ public class DriverTask {
828 828 mobile2.setMobile(p1);
829 829 mobileList.add(mobile2);
830 830 }
831   -
  831 +
  832 + String p2 = json.getString("principaledPhone");
  833 + if(p2 != null){
  834 + Mobile mobile3=new Mobile();
  835 + mobile3.setMobile(p2);
  836 + mobileList.add(mobile3);
  837 + }
  838 +
832 839 String smsString = "到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
833 840  
834 841 JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
... ...
trash-ui/dist.7z 0 → 100644
View file @9d60e0e
No preview for this file type
trash-ui/dist.zip deleted 100644 → 0
View file @e1e1df2
No preview for this file type
trash-ui/src/api/caseoffline.js
  View file @9d60e0e
... ... @@ -247,7 +247,7 @@ export default {
247 247 /** 查询线下交办案卷列表 */
248 248 getList() {
249 249 this.loading = true;
250   -
  250 +
251 251 if(this.queryParams.createTime){
252 252 this.queryParams.startTime = this.queryParams.createTime[0];
253 253 this.queryParams.endTime = this.queryParams.createTime[1];
... ... @@ -260,6 +260,9 @@ export default {
260 260 }
261 261  
262 262 query.createTime = null;
  263 +
  264 + if(query.place)
  265 + query.place = query.place + ""
263 266  
264 267 listCaseOffline(query).then(response => {
265 268 this.caseOfflineList = response.rows;
... ... @@ -442,6 +445,9 @@ export default {
442 445 for(var i in this.queryParams){
443 446 query[i] = this.queryParams[i];
444 447 }
  448 +
  449 + if(query.place)
  450 + query.place = query.place + ""
445 451  
446 452 query.createTime = null;
447 453 this.$confirm('是否确认导出所有线下交办案卷数据项?', "警告", {
... ...
trash-ui/src/api/dayWorkReport.js
  View file @9d60e0e
1 1 import h5Page from '@/views/h5/Pagination';
2   -
3   -import threeHistory from '@/views/business/threeHistory/index';
  2 +
  3 +import threeHistory from '@/views/business/threeHistory/index';
4 4 import earthInfo from '@/views/business/threeHistory/earthInfo';
5 5  
6 6 import {
... ... @@ -16,7 +16,7 @@ import {
16 16 addThreestep,
17 17 updateThreestep,
18 18 exportThreestep,
19   - getNames,
  19 + getNames,
20 20 postThreestep
21 21 } from "@/api/business/threestep";
22 22  
... ... @@ -33,16 +33,16 @@ import {
33 33 constructionsitesList,
34 34 getDict,
35 35 getArea
36   -} from "@/api/dict";
37   -
38   - import threestepInfo from "@/views/business/threestep/threestepInfo";
  36 +} from "@/api/dict";
  37 +
  38 +import threestepInfo from "@/views/business/threestep/threestepInfo";
39 39  
40 40 export default {
41 41 name: "dayWorkReport",
42 42 components: {
43 43 h5Page,
44   - threestepInfo,
45   - threeHistory,
  44 + threestepInfo,
  45 + threeHistory,
46 46 earthInfo,
47 47 },
48 48 data() {
... ... @@ -85,7 +85,7 @@ export default {
85 85 earthsitesName: null,
86 86 place: null,
87 87 subReason: null,
88   - timeRange:null,
  88 + timeRange: null,
89 89 },
90 90 // 表单参数
91 91 form: {},
... ... @@ -116,12 +116,12 @@ export default {
116 116 projectTypes: null,
117 117 earthsitesTypes: null,
118 118 dayWorkCount: null,
119   - outside: ["长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"],
120   - info2:false,
121   - businessKey:null,
122   - names:null,
123   - enames:null,
124   - threeHistoryType:0,
  119 + outside: ["长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"],
  120 + info2: false,
  121 + businessKey: null,
  122 + names: null,
  123 + enames: null,
  124 + threeHistoryType: 0,
125 125 };
126 126 },
127 127 created() {
... ... @@ -132,62 +132,59 @@ export default {
132 132 });
133 133  
134 134 },
135   - methods: {
136   - getInfo(row,type){
137   -
138   - if(!type){
139   - row.status = row.status == 1 ? "开工" : row.status;
140   - type = row.type;
141   -
142   - obj = {
143   - objectId:row.objectId,
144   - selfCheckTime:row.selfCheckTime,
145   - type:row.type
146   - }
147   -
148   - postThreestep(obj).then(res=>{
149   - if(res){
150   - this.businessKey = res.data.id + "";
151   - this.info2 = true;
152   - }
153   - });
154   -
155   - return;
156   - }
157   - let obj = {};
158   - if(type == 0){
159   - if(row.status != "开工"){
160   - return;
161   - }
162   - obj = {
163   - objectId:row.objectId,
164   - selfCheckTime:row.selfCheckTime,
165   - type:0
166   - }
167   -
168   - }else{
169   - if(row.estatus != "开工"){
170   - return;
171   - }
172   - obj = {
173   - objectId:row.eid,
174   - selfCheckTime:row.eselfCheckTime,
175   - type:1
176   - }
177   - }
178   -
179   -
180   -
181   - postThreestep(obj).then(res=>{
182   - if(res){
183   - this.businessKey = res.data.id + "";
184   - this.info2 = true;
185   - }
186   - });
187   -
188   -
189   -
190   -
  135 + methods: {
  136 + getInfo(row, type) {
  137 +
  138 + if (!type) {
  139 + row.status = row.status == 1 ? "开工" : row.status;
  140 + type = row.type;
  141 +
  142 + obj = {
  143 + objectId: row.objectId,
  144 + selfCheckTime: row.selfCheckTime,
  145 + type: row.type
  146 + }
  147 +
  148 + postThreestep(obj).then(res => {
  149 + if (res) {
  150 + this.businessKey = res.data.id + ""; this.info2 = true; }
  151 + });
  152 +
  153 + return;
  154 + }
  155 + let obj = {};
  156 + if (type == 0) {
  157 + if (row.status != "开工") {
  158 + return;
  159 + }
  160 + obj = {
  161 + objectId: row.objectId,
  162 + selfCheckTime: row.selfCheckTime,
  163 + type: 0
  164 + }
  165 +
  166 + } else {
  167 + if (row.estatus != "开工") {
  168 + return;
  169 + }
  170 + obj = {
  171 + objectId: row.eid,
  172 + selfCheckTime: row.eselfCheckTime,
  173 + type: 1
  174 + }
  175 + }
  176 +
  177 +
  178 +
  179 + postThreestep(obj).then(res => {
  180 + if (res) {
  181 + this.businessKey = res.data.id + ""; this.info2 = true;
  182 + }
  183 + });
  184 +
  185 +
  186 +
  187 +
191 188 },
192 189 areaClear() {
193 190 this.areaCode = null;
... ... @@ -221,7 +218,7 @@ export default {
221 218 var size = this.queryParams.pageSize;
222 219  
223 220 this.queryParams.page = 1;
224   - this.queryParams.pageSize = 9999;
  221 + this.queryParams.pageSize = 9999;
225 222  
226 223 if (this.queryParams.timeRange) {
227 224 this.queryParams.workStartTime = this.queryParams.timeRange[0];
... ... @@ -229,8 +226,20 @@ export default {
229 226 this.queryParams.timeRange = null;
230 227 }
231 228  
  229 +
  230 +
  231 +
  232 + if (this.queryParams.place && this.queryParams.place.length > 0) {
  233 + this.queryParams.place = this.queryParams.place + "";
  234 + }
  235 +
  236 + if (this.queryParams.subReason && this.queryParams.subReason.length > 0) {
  237 + this.queryParams.subReason = this.queryParams.subReason + "";
  238 + }
  239 +
  240 +
232 241 dayWorkList(this.queryParams).then(response => {
233   - let list = response.rows;
  242 + let list = response.rows;
234 243  
235 244 for (let i = 0; i < list.length; i++) {
236 245 list[i].place = this.getAreaName(list[i].place);
... ... @@ -279,9 +288,7 @@ export default {
279 288 });
280 289 } else {
281 290 exportDayWorkList(data).then(res => {
282   - console.log(page);
283 291 this.queryParams.page = page;
284   - console.log(size);
285 292 this.queryParams.pageSize = size;
286 293 this.download(res.message);
287 294  
... ... @@ -293,81 +300,108 @@ export default {
293 300  
294 301 },
295 302 /** 查询开工报表列表 */
296   - getList(tabIdx) {
297   -
298   - if(tabIdx && tabIdx > 3){
299   -
  303 + getList(tabIdx) {
  304 +
  305 + if (tabIdx && tabIdx > 3) {
  306 +
300 307 this.queryParams.his = tabIdx;
301   - this.$forceUpdate();
302   - return;
303   - }
304   -
  308 + this.$forceUpdate();
  309 + return;
  310 + }
  311 +
305 312  
306 313 this.loading = this.$loading({
307   - lock: true,
308   - text: 'Loading',
309   - spinner: 'el-icon-loading',
310   - background: 'rgba(255, 255, 255, 0.7)'
311   - });
  314 + lock: true,
  315 + text: 'Loading',
  316 + spinner: 'el-icon-loading',
  317 + background: 'rgba(255, 255, 255, 0.7)'
  318 + });
312 319 // let query = this.queryParams;
313 320  
314 321 if (this.queryParams.his != tabIdx && tabIdx == 1) {
315 322 this.queryParams.pageNum = 1;
316   - this.resetQuery();
317   - this.names = null;
  323 + this.resetQuery();
  324 + this.names = null;
318 325 this.ename = null;
319 326 this.queryParams.his = tabIdx;
320 327 } else if (this.queryParams.his != tabIdx && tabIdx == 0) {
321 328 this.queryParams.pageNum = 1;
322   - this.resetQuery();
323   - this.names = null;
  329 + this.resetQuery();
  330 + this.names = null;
324 331 this.ename = null;
325 332 this.queryParams.his = tabIdx;
326   - }
  333 + }
327 334  
328 335 const timeRange = this.queryParams.timeRange;
329 336 if (this.queryParams.timeRange) {
330 337 this.queryParams.workStartTime = this.queryParams.timeRange[0];
331 338 this.queryParams.workEndTime = this.queryParams.timeRange[1];
332 339 this.queryParams.timeRange = null;
333   - }
334   -
335   - if (tabIdx > 1 || this.queryParams.his > 1) {
336   - this.queryParams.his = tabIdx;
337   - this.queryParams.status = 1;
338   - if(tabIdx == 2){
339   - this.queryParams.type = 0;
340   - }else{
341   - this.queryParams.type = 1;
342   - }
343   -
344   - getNames(this.queryParams).then(res => {
345   - this.names = res;
346   - })
347   -
348   -
349   - listThreestep(this.queryParams).then(response => {
350   - this.threestepList = response.rows;
  340 + }
  341 +
  342 + if (tabIdx > 1 || this.queryParams.his > 1) {
  343 + this.queryParams.his = tabIdx;
  344 + this.queryParams.status = 1;
  345 + if (tabIdx == 2) {
  346 + this.queryParams.type = 0;
  347 + } else {
  348 + this.queryParams.type = 1;
  349 + }
  350 +
  351 + getNames(this.queryParams).then(res => {
  352 + this.names = res;
  353 + })
  354 +
  355 + if (this.queryParams.place && this.queryParams.place.length > 0) {
  356 + this.queryParams.place = this.queryParams.place + "";
  357 + }
  358 +
  359 + listThreestep(this.queryParams).then(response => {
  360 + this.threestepList = response.rows;
351 361 this.total = response.total;
352   -
353   - this.loading.close();
354   -
355   - for (let i = 0; i < this.threestepList.length; i++) {
356   - this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
357   - }
358   - });
359   - return;
360   - }
  362 +
  363 + if (this.queryParams.place && this.queryParams.place.length > 0) {
  364 + let ps = this.queryParams.place.split(",");
  365 + this.queryParams.place = [];
  366 + for (let i in ps) {
  367 + this.queryParams.place.push(Number(ps[i]));
  368 + }
  369 + }
  370 + this.loading.close();
  371 +
  372 + for (let i = 0; i < this.threestepList.length; i++) {
  373 + this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
  374 + }
  375 + });
  376 + return;
  377 + }
361 378  
  379 + if (this.queryParams.place && this.queryParams.place.length > 0) {
  380 + this.queryParams.place = this.queryParams.place + "";
  381 + }
362 382  
  383 + if (this.queryParams.subReason && this.queryParams.subReason.length > 0) {
  384 + this.queryParams.subReason = this.queryParams.subReason + "";
  385 + }
363 386 dayWorkList(this.queryParams).then(response => {
364   - this.threestepList = response.rows;
365   -
366   - if(!this.names){
367   - this.names = response.names;
368   - this.enames = response.enames;
369   - }
370   -
  387 + this.threestepList = response.rows;
  388 +
  389 + if (!this.names) {
  390 + this.names = response.names;
  391 + this.enames = response.enames;
  392 + }
  393 +
  394 + if (this.queryParams.place && this.queryParams.place.length > 0) {
  395 + let ps = this.queryParams.place.split(",");
  396 + this.queryParams.place = [];
  397 + for (let i in ps) {
  398 + this.queryParams.place.push(Number(ps[i]));
  399 + }
  400 + }
  401 +
  402 + if (this.queryParams.subReason && this.queryParams.subReason.length > 0) {
  403 + this.queryParams.subReason = this.queryParams.subReason.split(",");
  404 + }
371 405  
372 406 this.queryParams.timeRange = timeRange;
373 407 this.loading.close();
... ... @@ -430,7 +464,7 @@ export default {
430 464 this.queryParams.subReason = null;
431 465 this.queryParams.place = null;
432 466 this.queryParams.earthsitesName = null;
433   - this.queryParams.name = null;
  467 + this.queryParams.name = null;
434 468 this.queryParams.workAreaCodeName = null;
435 469  
436 470 this.resetForm("queryForm");
... ... @@ -539,7 +573,7 @@ export default {
539 573 confirmButtonText: "确定",
540 574 cancelButtonText: "取消",
541 575 type: "warning"
542   - }).then(function () {
  576 + }).then(function() {
543 577 return delThreestep(ids);
544 578 }).then(() => {
545 579 this.getList();
... ... @@ -547,25 +581,30 @@ export default {
547 581 })
548 582 },
549 583 /** 导出按钮操作 */
550   - handleExport() {
551   - if(this.queryParams.his > 1){
552   - const queryParams = this.queryParams;
553   - this.$confirm('是否确认导出所有报工数据项?', "警告", {
554   - confirmButtonText: "确定",
555   - cancelButtonText: "取消",
556   - type: "warning"
557   - }).then(function () {
558   - return exportThreestep(queryParams);
559   - }).then(response => {
560   - this.download(response.message);
561   - })
562   -
563   - return;
564   - }
565   -
566   -
567   -
  584 + handleExport() { const queryParams = this.queryParams;
  585 + if (this.queryParams.his > 1) {
  586 +
  587 + if (this.queryParams.place && this.queryParams.place.length > 0) {
  588 + queryParams.place = this.queryParams.place + "";
  589 + }
  590 +
  591 + if (this.queryParams.subReason && this.queryParams.subReason.length > 0) {
  592 + queryParams.subReason = this.queryParams.subReason + "";
  593 + }
  594 +
  595 + this.$confirm('是否确认导出所有报工数据项?', "警告", {
  596 + confirmButtonText: "确定",
  597 + cancelButtonText: "取消",
  598 + type: "warning"
  599 + }).then(function() {
568 600  
  601 + return exportThreestep(queryParams);
  602 + }).then(response => {
  603 + this.download(response.message);
  604 + })
  605 +
  606 + return;
  607 + }
569 608 let curPage = this.queryParams.page;
570 609 let curSize = this.queryParams.pageSize;
571 610 let that = this;
... ... @@ -574,11 +613,11 @@ export default {
574 613 confirmButtonText: "确定",
575 614 cancelButtonText: "取消",
576 615 type: "warning"
577   - }).then(function () {
  616 + }).then(function() {
578 617 that.loading = true;
579 618 that.getListAndExport();
580 619 });
581 620  
582 621 }
583 622 }
584   -};
  623 +};
... ...
trash-ui/src/api/taskhismethod.js
  View file @9d60e0e
... ... @@ -157,7 +157,7 @@ export default {
157 157 this.earthsites = true;
158 158 return;
159 159 }
160   - if (this.definitionKey == "workflow_conract") {
  160 + if (this.definitionKey == "workflow_conract" || this.definitionKey == "workflow_conract_edit") {
161 161 this.contract = true;
162 162 return;
163 163 }
... ...
trash-ui/src/api/taskmethod.js
  View file @9d60e0e
... ... @@ -242,7 +242,7 @@ export default {
242 242 this.earthsites = true;
243 243 return;
244 244 }
245   - if (this.definitionKey == "workflow_conract") {
  245 + if (this.definitionKey == "workflow_conract" || this.definitionKey == "workflow_conract_edit") {
246 246 this.contract = true;
247 247 return;
248 248 }
... ... @@ -566,6 +566,7 @@ export default {
566 566 this.definitionKey == "workflow_vehicle" ||
567 567 this.definitionKey == "workflow_earthsites" ||
568 568 this.definitionKey == "workflow_conract" ||
  569 + this.definitionKey == "workflow_conract_edit" ||
569 570 this.definitionKey == "workflow_constructsite_edit" ||
570 571 this.definitionKey == "workflow_earthsites_edit") {
571 572 formDataSave(this.id, this.form.formData).then(response => {
... ...
trash-ui/src/api/three_step.js
  View file @9d60e0e
... ... @@ -613,9 +613,22 @@ export default {
613 613 }
614 614  
615 615  
616   - this.loading = true;
  616 + this.loading = true;
  617 + if(this.queryParams.place){
  618 + this.queryParams.places = this.queryParams.place + "";
  619 + this.queryParams.place = [];
  620 + }
  621 +
  622 +
617 623 listThreestep(this.queryParams).then(response => {
618   - this.threestepList = response.rows;
  624 + this.threestepList = response.rows;
  625 + debugger;
  626 + if(this.queryParams.places){
  627 + let ps = this.queryParams.places.split(",");
  628 + for(let i in ps){
  629 + this.queryParams.place.push(Number(ps[i]));
  630 + }
  631 + }
619 632 this.total = response.total;
620 633 this.loading = false;
621 634 for (let i = 0; i < this.threestepList.length; i++) {
... ... @@ -1007,12 +1020,27 @@ export default {
1007 1020 },
1008 1021 /** 导出按钮操作 */
1009 1022 handleExport() {
1010   - const queryParams = this.queryParams;
  1023 + const queryParams = this.queryParams;
  1024 +
  1025 + if(this.queryParams.place){
  1026 + queryParams.places = this.queryParams.place + "";
  1027 + queryParams.place = [];
  1028 + }
  1029 +
  1030 +
  1031 +
1011 1032 this.$confirm('是否确认导出所有报工数据项?', "警告", {
1012 1033 confirmButtonText: "确定",
1013 1034 cancelButtonText: "取消",
1014 1035 type: "warning"
1015   - }).then(function () {
  1036 + }).then(function () {
  1037 +
  1038 + if(queryParams.places){
  1039 + let ps = this.queryParams.places.split(",");
  1040 + for(let i in ps){
  1041 + this.queryParams.place.push(Number(ps[i]));
  1042 + }
  1043 + }
1016 1044 return exportThreestep(queryParams);
1017 1045 }).then(response => {
1018 1046 this.download(response.message);
... ...
trash-ui/src/api/trackTable.js
  View file @9d60e0e
... ... @@ -253,7 +253,7 @@ export default {
253 253 this.tableList[i].type = "交办案卷"
254 254 }
255 255 if(this.tableList[i].type == 7){
256   - this.tableList[i].type = "违规案卷"
  256 + this.tableList[i].type = "预警信息"
257 257 }
258 258  
259 259 }
... ...
trash-ui/src/api/truck_credit.js
  View file @9d60e0e
... ... @@ -109,7 +109,6 @@ import h5Page from &#39;@/views/h5/Pagination&#39;;
109 109 let query = {
110 110 'page':1,
111 111 'size':9999,
112   - 'dishonestState':0
113 112 }
114 113 companyList(query).then(response => {
115 114  
... ...
trash-ui/src/api/vio_casefile.js
  View file @9d60e0e
... ... @@ -39,7 +39,7 @@ export default {
39 39 showSearch: true,
40 40 // 总条数
41 41 total: 0,
42   - // 平台违规案卷表格数据
  42 + // 预警信息表格数据
43 43 violationCaseFileList: [],
44 44 // 弹出层标题
45 45 title: "",
... ... @@ -282,7 +282,7 @@ export default {
282 282 // this.form.owningRegion = item.name;
283 283  
284 284 // },
285   - /** 查询平台违规案卷列表 */
  285 + /** 查询预警信息列表 */
286 286 getList() {
287 287 this.loading = true;
288 288 if(this.queryParams.createTime){
... ... @@ -297,6 +297,8 @@ export default {
297 297 }
298 298  
299 299 query.createTime = null;
  300 + if(query.owningRegion)
  301 + query.owningRegion = query.owningRegion + ""
300 302  
301 303 listViolationCaseFile(query).then(response => {
302 304 this.violationCaseFileList = response.rows;
... ... @@ -362,7 +364,7 @@ export default {
362 364 handleInfo(row) {
363 365 this.idInfo = row.id + "";
364 366 this.openInfo = true;
365   - this.title = "平台违规案卷详情";
  367 + this.title = "预警信息详情";
366 368 },
367 369 /** 新增按钮操作 */
368 370 handleAdd() {
... ... @@ -373,7 +375,7 @@ export default {
373 375 this.form.number = this.getNumber();
374 376 this.form.violationGrade = "一般类";
375 377 this.form.sendObject = "区管理部门";
376   - this.title = "添加平台违规案卷";
  378 + this.title = "添加预警信息";
377 379 },
378 380 /** 修改按钮操作 */
379 381 handleUpdate(row) {
... ... @@ -384,7 +386,7 @@ export default {
384 386 let files = JSON.stringify(response.data.uploadFiles);
385 387 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
386 388 this.open = true;
387   - this.title = "修改平台违规案卷";
  389 + this.title = "修改预警信息";
388 390 });
389 391 },
390 392 /** 提交按钮 */
... ... @@ -444,7 +446,7 @@ export default {
444 446 /** 删除按钮操作 */
445 447 handleDelete(row) {
446 448 const ids = row.id || this.ids;
447   - this.$confirm('是否确认删除平台违规案卷编号为"' + ids + '"的数据项?', "警告", {
  449 + this.$confirm('是否确认删除预警信息编号为"' + ids + '"的数据项?', "警告", {
448 450 confirmButtonText: "确定",
449 451 cancelButtonText: "取消",
450 452 type: "warning"
... ... @@ -469,8 +471,11 @@ export default {
469 471 }
470 472  
471 473 query.createTime = null;
472   -
473   - this.$confirm('是否确认导出所有平台违规案卷数据项?', "警告", {
  474 +
  475 + if(query.owningRegion)
  476 + query.owningRegion = query.owningRegion + ""
  477 +
  478 + this.$confirm('是否确认导出所有预警信息数据项?', "警告", {
474 479 confirmButtonText: "确定",
475 480 cancelButtonText: "取消",
476 481 type: "warning"
... ...
trash-ui/src/api/warningInfo.js
  View file @9d60e0e
... ... @@ -27,7 +27,6 @@ import {
27 27 getEarthSitesList,
28 28 getConstructionList,
29 29 getCompanyList,
30   - getAreaList
31 30 } from "@/api/casefile/remoteServer";
32 31 import {getBase64} from "@/api/business/threestep";
33 32  
... ... @@ -157,8 +156,8 @@ export default {
157 156 this.caseType = res.rows;
158 157 });
159 158  
160   - getAreaList().then(res => {
161   - this.areas = res.data;
  159 + getArea().then(res => {
  160 + this.areas = res.result;
162 161 });
163 162  
164 163  
... ... @@ -260,9 +259,12 @@ export default {
260 259 }
261 260  
262 261 query.createTime = null;
  262 + if(query.owningRegion)
  263 + query.owningRegion = query.owningRegion + ""
  264 +
  265 + listViolationWarningInformation(query).then(response => {
263 266  
264 267  
265   - listViolationWarningInformation(query).then(response => {
266 268 this.violationWarningInformationList = response.rows;
267 269 this.total = response.total;
268 270 this.loading = false;
... ... @@ -324,7 +326,7 @@ export default {
324 326 handleInfo(row) {
325 327 this.idInfo = row.id + "";
326 328 this.openInfo = true;
327   - this.title = "平台违规案卷详情";
  329 + this.title = "违规预警详情";
328 330 },
329 331 /** 新增按钮操作 */
330 332 handleAdd() {
... ... @@ -427,7 +429,9 @@ export default {
427 429 for(var i in this.queryParams){
428 430 query[i] = this.queryParams[i];
429 431 }
430   -
  432 + if(query.owningRegion)
  433 + query.owningRegion = query.owningRegion + ""
  434 +
431 435 query.createTime = null;
432 436  
433 437 this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @9d60e0e
... ... @@ -30,8 +30,8 @@
30 30 <el-option label="驾驶员信息审批" value="workflow_driver"/>
31 31 <el-option label="报工审批" value="workflow_threestep"/>
32 32 <el-option label="交办案卷" value="workflow_caseoffline"/>
33   - <el-option label="违规案卷处置流程" value="workflow_casefile"/>
34   - <el-option label="平台预警信息" value="violation_warning"/>
  33 + <el-option label="预警信息" value="workflow_casefile"/>
  34 + <el-option label="预警提醒" value="violation_warning"/>
35 35 <el-option label="办文办事" value="handleAffairs"/>
36 36 <el-option label="后勤管理" value="logistics"/>
37 37 <el-option label="会议事务" value="conference"/>
... ...
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @9d60e0e
... ... @@ -22,8 +22,8 @@
22 22 <el-option label="驾驶员信息审批" value="workflow_driver"/>
23 23 <el-option label="报工审批" value="workflow_threestep"/>
24 24 <el-option label="交办案卷" value="workflow_caseoffline"/>
25   - <el-option label="违规案卷处置流程" value="workflow_casefile"/>
26   - <el-option label="平台预警信息" value="violation_warning"/>
  25 + <el-option label="预警信息" value="workflow_casefile"/>
  26 + <el-option label="预警提醒" value="violation_warning"/>
27 27 <el-option label="办文办事" value="handleAffairs"/>
28 28 <el-option label="后勤管理" value="logistics"/>
29 29 <el-option label="会议事务" value="conference"/>
... ...
trash-ui/src/views/business/DriverCredit/index.vue
  View file @9d60e0e
... ... @@ -109,8 +109,7 @@
109 109 reserve-keyword
110 110 placeholder="驾驶员姓名"
111 111 @change="getObjId">
112   - <el-option
113   - v-if="dictNames.indexOf(item.name) == -1"
  112 + <el-option
114 113 v-for="item in driverList"
115 114 :key="item.id"
116 115 :label="item.name"
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @9d60e0e
... ... @@ -58,14 +58,14 @@
58 58 </el-col>
59 59 <el-col :span="4">
60 60 <el-form-item label="工地区属" >
61   - <el-select v-model="queryParams.place" placeholder="工地所属区域 " size="small">
  61 + <el-select v-model="queryParams.place" multiple placeholder="工地所属区域 " size="small">
62 62 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
63 63 </el-select>
64 64 </el-form-item>
65 65 </el-col>
66 66 <el-col :span="4">
67 67 <el-form-item label="处理场所区属" >
68   - <el-select v-model="queryParams.subReason" placeholder="工地所属区域 " size="small">
  68 + <el-select v-model="queryParams.subReason" multiple placeholder="工地所属区域 " size="small">
69 69 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
70 70 </el-select>
71 71 </el-form-item>
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @9d60e0e
... ... @@ -23,7 +23,7 @@
23 23 </el-select>
24 24 </el-form-item>
25 25 <el-form-item label="所属区域" prop="place">
26   - <el-select v-model="queryParams.place" placeholder="请选择所属区域 " size="small">
  26 + <el-select v-model="queryParams.place" multiple placeholder="请选择所属区域 " size="small">
27 27 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
28 28 </el-select>
29 29 </el-form-item>
... ...
trash-ui/src/views/business/track/index.vue
  View file @9d60e0e
... ... @@ -9,7 +9,7 @@
9 9 <el-menu-item index="4">车辆</el-menu-item>
10 10 <el-menu-item index="5">后勤管理</el-menu-item>
11 11 <el-menu-item index="6">交办案卷</el-menu-item>
12   - <el-menu-item index="7">违规案卷</el-menu-item>
  12 + <el-menu-item index="7">预警信息</el-menu-item>
13 13 <el-menu-item index="99">设置</el-menu-item>
14 14 </el-menu>
15 15  
... ... @@ -374,7 +374,7 @@
374 374 oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=1){value=1} if(value>100){value=100}"/>
375 375 </el-form-item></el-col>
376 376 </el-row>
377   - <h3>违规案卷</h3>
  377 + <h3>预警信息</h3>
378 378 <el-row>
379 379 <el-col :span="8">
380 380 <el-form-item label="异常流程审批超时(天)" >
... ...
trash-ui/src/views/business/track/trackTable.vue
  View file @9d60e0e
... ... @@ -26,7 +26,7 @@
26 26 <el-option value="4" label="车辆"/>
27 27 <el-option value="5" label="后勤管理"/>
28 28 <el-option value="6" label="交办案卷" />
29   - <el-option value="7" label="违规案卷"/>
  29 + <el-option value="7" label="预警信息"/>
30 30 </el-select>
31 31  
32 32 </el-form-item>
... ...
trash-ui/src/views/caseOffline/caseOffline/index.vue
  View file @9d60e0e
... ... @@ -7,7 +7,7 @@
7 7 </el-select>
8 8 </el-form-item>
9 9 <el-form-item label="所属区域" prop="place">
10   - <el-select v-model="queryParams.place" placeholder="请选择所属区域" size="small">
  10 + <el-select v-model="queryParams.place" multiple placeholder="请选择所属区域" size="small">
11 11 <el-option v-for="item in areas" :label="item.name" :value="item.code"/>
12 12 </el-select>
13 13 </el-form-item>
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @9d60e0e
... ... @@ -3,20 +3,20 @@
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4 4 <el-row>
5 5 <el-form-item label="所属区域" prop="owningRegion">
6   - <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" size="small">
  6 + <el-select v-model="queryParams.owningRegion" multiple placeholder="请选择所属区域" size="small">
7 7 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
8 8 </el-select>
9 9  
10 10 </el-form-item>
11   - <el-form-item label="违规类型" prop="violationType">
12   - <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" size="small">
13   - <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
  11 + <el-form-item label="预警类型" prop="violationType">
  12 + <el-select v-model="queryParams.violationType" placeholder="请选择预警类型" size="small">
  13 + <el-option v-for="item in caseType" v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
14 14 </el-select>
15 15 </el-form-item>
16 16  
17 17  
18   - <el-form-item label="违规对象类型" prop="violationObjectType">
19   - <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" size="small">
  18 + <el-form-item label="预警对象类型" prop="violationObjectType">
  19 + <el-select v-model="queryParams.violationObjectType" placeholder="请选择预警对象类型" size="small">
20 20 <el-option label="工地" value="0" />
21 21 <el-option label="处理场所" value="1" />
22 22 <el-option label="企业" value="2" />
... ... @@ -24,10 +24,10 @@
24 24 </el-form-item>
25 25 </el-row>
26 26 <el-row>
27   - <el-form-item label="违规对象" prop="projectName">
  27 + <el-form-item label="预警对象" prop="projectName">
28 28 <el-input
29 29 v-model="queryParams.projectName"
30   - placeholder="请输入违规对象"
  30 + placeholder="请输入预警对象"
31 31 size="small"
32 32 />
33 33 </el-form-item>
... ... @@ -72,7 +72,7 @@
72 72 v-hasPermi="['casefile:violationCaseFile:add']"
73 73  
74 74 v-if="checkPer(['intelligencecontrols.messagemanage.enter'])"
75   - >违规案卷录入</el-button>
  75 + >预警信息录入</el-button>
76 76 </el-col>
77 77 <!-- <el-col :span="1.5">-->
78 78 <!-- <el-button-->
... ... @@ -100,13 +100,13 @@
100 100 <el-table-column type="selection" width="55" align="center" />
101 101 <el-table-column label="序号" align="center" type='index'/>
102 102 <el-table-column label="所属区域" align="center" prop="owningRegion" />
103   - <el-table-column label="违规对象" align="center" prop="projectName" />
104   - <el-table-column label="违规对象类型" align="center" prop="violationObjectType">
  103 + <el-table-column label="预警对象" align="center" prop="projectName" />
  104 + <el-table-column label="预警对象类型" align="center" prop="violationObjectType">
105 105 <template slot-scope="scope">
106 106 <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"处理场所":"企业"}}</span>
107 107 </template>
108 108 </el-table-column>
109   - <el-table-column label="违规类型" align="center" prop="violationType">
  109 + <el-table-column label="预警类型" align="center" prop="violationType">
110 110 <template slot-scope="scope">
111 111 <span>{{getCaseType(scope.row.violationType)}}</span>
112 112 </template>
... ... @@ -199,7 +199,7 @@
199 199 @pagination="getList"
200 200 />
201 201  
202   - <!-- 添加或修改平台违规案卷对话框 -->
  202 + <!-- 添加或修改平台预警信息对话框 -->
203 203 <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
204 204 <el-form ref="form" :model="form" :rules="rules" label-width="115px">
205 205 <el-row :gutter="2">
... ... @@ -209,8 +209,8 @@
209 209 </el-form-item>
210 210 </el-col>
211 211 <el-col :span="11">
212   - <el-form-item label="违规对象类型" prop="violationObjectType">
213   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" size="small" style="width: 100%">
  212 + <el-form-item label="预警对象类型" prop="violationObjectType">
  213 + <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" size="small" style="width: 100%">
214 214 <el-option label="工地" value="0" />
215 215 <el-option label="处理场所" value="1" />
216 216 <el-option label="企业" value="2" />
... ... @@ -227,8 +227,8 @@
227 227 </el-form-item>
228 228 </el-col>
229 229 <el-col :span="11">
230   - <el-form-item label="违规类型" prop="violationType">
231   - <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
  230 + <el-form-item label="预警类型" prop="violationType">
  231 + <el-select v-model="form.violationType" placeholder="请选择预警类型" style="width: 100%;">
232 232 <el-option v-for="item in caseType" v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
233 233 </el-select>
234 234 </el-form-item>
... ... @@ -236,21 +236,21 @@
236 236 </el-row>
237 237 <el-row :gutter="2">
238 238 <el-col :span="11">
239   - <el-form-item label="违规等级" prop="violationGrade">
240   - <el-select v-model="form.violationGrade" placeholder="请选择违规等级" style="width: 100%;">
  239 + <el-form-item label="预警等级" prop="violationGrade">
  240 + <el-select v-model="form.violationGrade" placeholder="请选择预警等级" style="width: 100%;">
241 241 <el-option label="一般类" value="一般类"/>
242 242 <el-option label="重点类" value="重点类" />
243 243 </el-select>
244 244 </el-form-item>
245 245 </el-col>
246 246 <el-col :span="11">
247   - <el-form-item label="违规对象" prop="projectName">
  247 + <el-form-item label="预警对象" prop="projectName">
248 248 <el-select
249 249 v-model="form.projectName"
250 250 :filterable="true"
251 251 :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"
252 252 :filter-method="getRemoteDate">
253   - <el-option v-for="item in projectNameList[form.violationObjectType]"
  253 + <el-option v-for="item in projectNameList[form.violationObjectType]"
254 254 :key="item.name" :label="item.name" :value="item.name" :title="item.name"
255 255 @click.native="getAreaName(item.areaCode)"></el-option>
256 256 </el-select>
... ... @@ -274,12 +274,12 @@
274 274  
275 275 <el-row :gutter="2">
276 276 <el-col :span="8" :offset="3">
277   - <el-button style="margin-left: 14px" type="primary" @click="createDescribe">生成违规描述</el-button>
  277 + <el-button style="margin-left: 14px" type="primary" @click="createDescribe">生成预警描述</el-button>
278 278 </el-col>
279 279 </el-row>
280 280 <el-row>
281 281 <el-col :span="22">
282   - <el-form-item label="违规描述" prop="describe">
  282 + <el-form-item label="预警描述" prop="describe">
283 283 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4"/>
284 284 </el-form-item>
285 285 </el-col>
... ...
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
  View file @9d60e0e
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form ref="queryForm" :inline="true" label-width="105px">
4 4 <el-form-item label="所属区域" prop="owningRegion">
5   - <el-select v-model="owningRegion" placeholder="请选择所属区域" clearable size="small">
  5 + <el-select v-model="owningRegion" multiple placeholder="请选择所属区域" clearable size="small">
6 6 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
7 7 </el-select>
8 8 </el-form-item>
... ... @@ -27,11 +27,11 @@
27 27 {{ owningRegion != "" && owningRegion != null ? owningRegion : "长沙市" }}
28 28 </template>
29 29 </el-table-column>
30   - <el-table-column property="type" label="案卷类型" header-align="center" align="center"></el-table-column>
31   - <el-table-column property="count" label="违规案卷数" header-align="center" align="center"></el-table-column>
32   - <el-table-column property="repCount" label="违规案卷回复数" header-align="center"
  30 + <el-table-column property="type" label="预警类型" header-align="center" align="center"></el-table-column>
  31 + <el-table-column property="count" label="预警信息数" header-align="center" align="center"></el-table-column>
  32 + <el-table-column property="repCount" label="预警信息回复数" header-align="center"
33 33 align="center"></el-table-column>
34   - <el-table-column property="repPct" label="违规案卷回复率" header-align="center" align="center"></el-table-column>
  34 + <el-table-column property="repPct" label="预警信息回复率" header-align="center" align="center"></el-table-column>
35 35 </el-table>
36 36 </div>
37 37 </template>
... ... @@ -39,7 +39,7 @@
39 39 <script>
40 40  
41 41 import {caseTable} from "@/api/casefile/violationCaseFile";
42   -import {getAreaList} from "@/api/casefile/remoteServer";
  42 +import {getArea} from "@/api/dict";
43 43  
44 44 export default {
45 45 name: "caseTable",
... ... @@ -60,8 +60,8 @@ export default {
60 60 this.tableData = res.data;
61 61 this.hackReset = true;
62 62 });
63   - getAreaList().then(res => {
64   - this.areas = res.data;
  63 + getArea().then(res => {
  64 + this.areas = res.result;
65 65 });
66 66 },
67 67 methods: {
... ... @@ -117,8 +117,12 @@ export default {
117 117 if(this.createTime.length!=0){
118 118 startDate = this.createTime[0];
119 119 endDate = this.createTime[1];
120   - }
121   - caseTable({owningRegion: this.owningRegion, startDate: startDate, endDate: endDate}).then(res => {
  120 + }
  121 + let owningRegion = null;
  122 + if(this.owningRegion)
  123 + owningRegion = this.owningRegion + ""
  124 +
  125 + caseTable({owningRegion: owningRegion, startDate: startDate, endDate: endDate}).then(res => {
122 126 this.tableData = res.data;
123 127 this.hackReset = false;
124 128 this.$nextTick(() => {
... ...
trash-ui/src/views/casefile/violationWarningInformation/index.vue
  View file @9d60e0e
... ... @@ -9,13 +9,13 @@
9 9 </el-select>
10 10 </el-form-item>
11 11 <el-form-item label="所属区域" prop="owningRegion">
12   - <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" clearable size="small">
  12 + <el-select v-model="queryParams.owningRegion" multiple placeholder="请选择所属区域" clearable size="small">
13 13 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
14 14 </el-select>
15 15 </el-form-item>
16 16 <el-form-item label="预警类型" prop="violationType">
17 17 <el-select v-model="queryParams.violationType" placeholder="请选择预警类型" clearable size="small">
18   - <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
  18 + <el-option v-for="item in caseType" v-if="item.status=='0'" :label="item.dictLabel" :value="item.dictValue" />
19 19 </el-select>
20 20 </el-form-item>
21 21 <el-form-item label="预警对象" prop="projectName">
... ... @@ -143,8 +143,8 @@
143 143 <el-form ref="form" :model="form" :rules="rules" label-width="115px">
144 144 <el-row :gutter="2">
145 145 <el-col :span="11">
146   - <el-form-item label="案卷编号" prop="number">
147   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
  146 + <el-form-item label="预警编号" prop="number">
  147 + <el-input v-model="form.number" placeholder="请输入预警编号" :disabled="true"/>
148 148 </el-form-item>
149 149 </el-col>
150 150 <el-col :span="11">
... ...
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
  View file @9d60e0e
... ... @@ -2,8 +2,8 @@
2 2 <el-form ref="form" :model="form" label-width="115px">
3 3 <el-row :gutter="2">
4 4 <el-col :span="11">
5   - <el-form-item label="案卷编号" prop="number">
6   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
  5 + <el-form-item label="预警编号" prop="number">
  6 + <el-input v-model="form.number" placeholder="请输入预警编号" :disabled="true"/>
7 7 </el-form-item>
8 8 </el-col>
9 9 <el-col :span="11">
... ...
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
  View file @9d60e0e
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form ref="queryForm" :inline="true" label-width="105px">
4 4 <el-form-item label="所属区域" prop="owningRegion">
5   - <el-select v-model="owningRegion" placeholder="请选择所属区域" clearable size="small">
  5 + <el-select v-model="owningRegion" multiple placeholder="请选择所属区域" clearable size="small">
6 6 <el-option v-for="item in areas" :label="item.name" :value="item.name"/>
7 7 </el-select>
8 8 </el-form-item>
... ... @@ -27,10 +27,10 @@
27 27 </template>
28 28 </el-table-column>
29 29 <el-table-column property="type" label="预警类型" header-align="center" align="center"></el-table-column>
30   - <el-table-column property="count" label="预警案卷数" header-align="center" align="center"></el-table-column>
31   - <el-table-column property="repCount" label="预警案卷回复数" header-align="center"
  30 + <el-table-column property="count" label="预警提醒数" header-align="center" align="center"></el-table-column>
  31 + <el-table-column property="repCount" label="预警提醒回复数" header-align="center"
32 32 align="center"></el-table-column>
33   - <el-table-column property="repPct" label="预警案卷回复率" header-align="center" align="center"></el-table-column>
  33 + <el-table-column property="repPct" label="预警提醒回复率" header-align="center" align="center"></el-table-column>
34 34 </el-table>
35 35 </div>
36 36 </template>
... ... @@ -38,7 +38,7 @@
38 38 <script>
39 39  
40 40 import {caseTable} from "@/api/casefile/violationWarningInformation";
41   -import {getAreaList} from "@/api/casefile/remoteServer";
  41 +import {getArea} from "@/api/dict";
42 42  
43 43 export default {
44 44 name: "caseTable",
... ... @@ -59,8 +59,8 @@ export default {
59 59 this.tableData = res.data;
60 60 this.hackReset = true;
61 61 });
62   - getAreaList().then(res => {
63   - this.areas = res.data;
  62 + getArea().then(res => {
  63 + this.areas = res.result;
64 64 });
65 65 },
66 66 methods: {
... ... @@ -116,8 +116,13 @@ export default {
116 116 if(this.createTime.length!=0){
117 117 startDate = this.createTime[0];
118 118 endDate = this.createTime[1];
119   - }
120   - caseTable({owningRegion:this.owningRegion,startDate:startDate,endDate:endDate}).then(res => {
  119 + }
  120 +
  121 + let owningRegion = null;
  122 + if(this.owningRegion)
  123 + owningRegion = this.owningRegion + ""
  124 +
  125 + caseTable({owningRegion:owningRegion,startDate:startDate,endDate:endDate}).then(res => {
121 126 this.tableData = res.data;
122 127 this.hackReset = false;
123 128 this.$nextTick(() => {
... ...
trash-ui/src/views/h5/task/index.vue
  View file @9d60e0e
... ... @@ -26,8 +26,8 @@
26 26 <el-option label="驾驶员信息审批" value="workflow_driver"/>
27 27 <el-option label="报工审批" value="workflow_threestep"/>
28 28 <el-option label="交办案卷" value="workflow_caseoffline"/>
29   - <el-option label="违规案卷处置流程" value="workflow_casefile"/>
30   - <el-option label="平台预警信息" value="violation_warning"/>
  29 + <el-option label="预警信息" value="workflow_casefile"/>
  30 + <el-option label="预警提醒" value="violation_warning"/>
31 31 <el-option label="办文办事" value="handleAffairs"/>
32 32 <el-option label="后勤管理" value="logistics"/>
33 33 <el-option label="会议事务" value="conference"/>
... ...
trash-ui/src/views/h5/task/violationCaseFileInfo.vue
  View file @9d60e0e
1 1 <template>
2 2 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
3 3  
4   - <el-form-item label="案卷编号" prop="number">
5   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
  4 + <el-form-item label="预警编号" prop="number">
  5 + <el-input v-model="form.number" placeholder="请输入预警编号" :disabled="true"/>
6 6 </el-form-item>
7 7  
8   - <el-form-item label="违规对象类型" prop="violationObjectType">
9   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
  8 + <el-form-item label="预警对象类型" prop="violationObjectType">
  9 + <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;" :disabled="true">
10 10 <el-option label="工地" value="0" />
11 11 <el-option label="处理场所" value="1" />
12 12 <el-option label="企业" value="2" />
... ... @@ -21,12 +21,12 @@
21 21 </el-select>
22 22 </el-form-item>
23 23  
24   - <el-form-item label="违规类型" prop="violationType">
  24 + <el-form-item label="预警类型" prop="violationType">
25 25 <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
26 26 </el-form-item>
27 27  
28 28  
29   - <el-form-item label="违规等级" prop="violationGrade">
  29 + <el-form-item label="预警等级" prop="violationGrade">
30 30 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
31 31 <el-option label="一般类" value="一般类"/>
32 32 <el-option label="重点类" value="重点类" />
... ... @@ -63,7 +63,7 @@
63 63 <el-input :value="form.readTime" :disabled="true"/>
64 64 </el-form-item>
65 65  
66   - <el-form-item label="违规描述" prop="describe">
  66 + <el-form-item label="预警描述" prop="describe">
67 67 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
68 68 </el-form-item>
69 69  
... ...
trash-ui/src/views/h5/taskhistory/index.vue
  View file @9d60e0e
... ... @@ -12,8 +12,8 @@
12 12 <el-option label="驾驶员信息审批" value="workflow_driver"/>
13 13 <el-option label="报工审批" value="workflow_threestep"/>
14 14 <el-option label="交办案卷" value="workflow_caseoffline"/>
15   - <el-option label="违规案卷处置流程" value="workflow_casefile"/>
16   - <el-option label="平台预警信息" value="violation_warning"/>
  15 + <el-option label="预警信息" value="workflow_casefile"/>
  16 + <el-option label="预警提醒" value="violation_warning"/>
17 17 <el-option label="办文办事" value="handleAffairs"/>
18 18 <el-option label="后勤管理" value="logistics"/>
19 19 <el-option label="会议事务" value="conference"/>
... ...
trash-ui/src/views/h5/violationCaseFile/index.vue
  View file @9d60e0e
... ... @@ -93,13 +93,13 @@
93 93 @pagination="getList"
94 94 />
95 95  
96   - <!-- 添加或修改平台违规案卷对话框 -->
  96 + <!-- 添加或修改平台违规预警对话框 -->
97 97 <el-dialog :title="title" :visible.sync="open" width="300px" append-to-body :close-on-click-modal="false">
98 98 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
99 99 <el-row :gutter="2">
100 100 <el-col :span="11">
101   - <el-form-item label="案卷编号" prop="number">
102   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
  101 + <el-form-item label="预警编号" prop="number">
  102 + <el-input v-model="form.number" placeholder="请输入预警编号" :disabled="true"/>
103 103 </el-form-item>
104 104 </el-col>
105 105 <el-col :span="11">
... ...
trash-ui/src/views/h5/violationWarningInformation/index.vue
  View file @9d60e0e
... ... @@ -90,8 +90,8 @@
90 90 <el-dialog :title="title" :visible.sync="open" width="300px" append-to-body :close-on-click-modal="false">
91 91 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
92 92  
93   - <el-form-item label="案卷编号" prop="number">
94   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
  93 + <el-form-item label="预警编号" prop="number">
  94 + <el-input v-model="form.number" placeholder="请输入预警编号" :disabled="true"/>
95 95 </el-form-item>
96 96 <el-form-item label="预警对象类型" prop="violationObjectType">
97 97 <el-select v-model="form.violationObjectType" placeholder="请选择预警对象类型" style="width: 100%;">
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @9d60e0e
... ... @@ -73,7 +73,6 @@ public class SupervisionThreestepController extends BaseController {
73 73 @GetMapping("/list")
74 74 public TableDataInfo list(SupervisionThreestep supervisionThreestep) {
75 75 startPage();
76   -
77 76 List<SupervisionThreestep> list = supervisionThreestepService
78 77 .selectSupervisionThreestepList(supervisionThreestep);
79 78 return getDataTable(list);
... ... @@ -292,7 +291,11 @@ public class SupervisionThreestepController extends BaseController {
292 291 for(Object obj:constructionList){
293 292 objIds.add(((JSONObject)obj).getString("id"));
294 293 }
295   - list.get(i).setWorkAreaCodeName(((JSONObject)constructionList.get(objIds.indexOf(list.get(i).getObjectId()))).getString("workAreaCodeName"));
  294 +
  295 + int x = objIds.indexOf(list.get(i).getObjectId());
  296 + if(x > -1){
  297 + list.get(i).setWorkAreaCodeName(((JSONObject)constructionList.get(x)).getString("workAreaCodeName"));
  298 + }
296 299  
297 300 list.get(i).setId((long) i + 1);
298 301  
... ...
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
  View file @9d60e0e
... ... @@ -138,7 +138,18 @@ public class SupervisionThreestep extends BaseEntity
138 138 private String attchItem2;
139 139 private String attchItem3;
140 140  
141   - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
  141 + private String[] places;
  142 +
  143 +
  144 + public String[] getPlaces() {
  145 + return places;
  146 + }
  147 +
  148 + public void setPlaces(String[] places) {
  149 + this.places = places;
  150 + }
  151 +
  152 + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
142 153 private Date workStartTime;
143 154  
144 155 @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
  View file @9d60e0e
... ... @@ -96,10 +96,10 @@ public class DriverCreditServiceImpl implements IDriverCreditService
96 96 JSONObject json = (JSONObject) obj;
97 97 if(companys.indexOf(json.getString("companyId")) > -1){
98 98 ids.add(json.getString("id"));
  99 + System.out.print(json.getString("id") + " ");
99 100 }
100 101 }
101 102  
102   -
103 103 driverCredit.setIds(ids);
104 104  
105 105  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @9d60e0e
... ... @@ -341,166 +341,53 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
341 341 redisCache.setCacheObject("areas", areas);
342 342 }
343 343  
344   - // boolean isAdmin = false;
345   - //
346   - // if
347   - // ("事务中心".equals(SecurityUtils.getLoginUser().getUser().getCompanyName()))
348   - // {
349   - // supervisionThreestep.setPlace(null);
350   - // isAdmin = true;
351   - // } else if
352   - // ("渣土办".equals(SecurityUtils.getLoginUser().getUser().getCompanyName()))
353   - // {
354   - // supervisionThreestep.setPlace(SecurityUtils.getLoginUser().getUser().getAreaCode());
355   - // areaCode = SecurityUtils.getLoginUser().getUser().getAreaCode();
356   - // isAdmin = true;
357   - // }
358   -
359 344 List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
360 345 List<SupervisionThreestep> filterList = new ArrayList<>();
361 346  
362 347 List<SupervisionThreestep> constructions = new ArrayList<>();
363 348 List<SupervisionThreestep> earthsites = new ArrayList<>();
364   -
365   - List<Map<String, String>> list = new ArrayList<>();
366   -
367   - String companyName = SecurityUtils.getLoginUser().getUser().getCompanyName();
368   -
369   - // if (!isAdmin && areaCode.isEmpty()) {
370   - //
371   - // if (companyName != null) {
372   - //
373   - // JSONArray array = redisCache.getCacheObject("constructionList");
374   - //
375   - // for (SupervisionThreestep three : allList) {
376   - // if (three.getType() == 1) {
377   - // filterList.add(three);
378   - // continue;
379   - // }
380   - //
381   - // for (Object obj : array) {
382   - // JSONObject con = (JSONObject) obj;
383   - // if (three.getObjectId().equals(con.getString("id"))) {
384   - //
385   - // if (con.getString("transportCompany") != null
386   - // && con.getString("transportCompany").equals(companyName)) {
387   - //
388   - // filterList.add(three);
389   - // continue;
390   - // }
391   - //
392   - // JSONArray array2 =
393   - // RemoteServerUtils.getUnitetransport(con.getString("id"));
394   - //
395   - // for (Object comObj : array2) {
396   - // JSONObject company = (JSONObject) comObj;
397   - //
398   - // if (company.getString("companyName") != null
399   - // && company.getString("companyName").equals(companyName)) {
400   - //
401   - // filterList.add(three);
402   - // break;
403   - // }
404   - // }
405   - // }
406   - // }
407   - //
408   - // }
409   - // }
410   - // } else {
411   - filterList = allList;
412   - // }
413   -
414   - for (SupervisionThreestep s : filterList) {
415   - if (s.getType() == 1) {
416   - for (Object object : areas) {
417   - JSONObject area = (JSONObject) object;
418   - if (s.getPlace().equals(area.getString("code"))) {
419   - s.setPlace(area.getString("name"));
420   - }
421   -
422   - if (areaCode.equals(area.getString("code"))) {
423   - areaCode = area.getString("name");
424   - }
425   - }
426   - }
427   -
428   - if (supervisionThreestep.getHis().equals("1")) {
429   - if (yearFomat.format(s.getSelfCheckTime()).equals(yearFomat.format(new Date()))) {
430   - continue;
431   - }
432   - }
433   -
434   - if (s.getType() == 0) {
435   - constructions.add(s);
436   - } else {
437   - earthsites.add(s);
438   - }
  349 + List<Map<String, String>> list = null;
  350 + if(supervisionThreestep.getHis().equals("1")){
  351 + list = redisCache.getCacheObject("dayWorkList");
439 352 }
440   -
441   - for (SupervisionThreestep s : constructions) {
442   -
443   - if (supervisionThreestep.getHis().equals("1")) {
444   - for (SupervisionThreestep e : earthsites) {
445   -
446   - if (!s.getEarthsitesId().contains(e.getObjectId()))
447   - continue;
448   -
449   - if (yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))) {
450   -
451   - if (s.getStatus() != 1 || e.getStatus() != 1) {
452   - continue;
  353 + if (list == null || list.size() == 0) {
  354 + list = new ArrayList<Map<String, String>>();
  355 + String companyName = SecurityUtils.getLoginUser().getUser().getCompanyName();
  356 +
  357 + filterList = allList;
  358 +
  359 + for (SupervisionThreestep s : filterList) {
  360 + if (s.getType() == 1) {
  361 + for (Object object : areas) {
  362 + JSONObject area = (JSONObject) object;
  363 + if (s.getPlace().equals(area.getString("code"))) {
  364 + s.setPlace(area.getString("name"));
453 365 }
454 366  
455   - Map<String, String> map = new HashMap<String, String>();
456   - map.put("id", s.getId() + "");
457   - map.put("createTime", yearFomat.format(s.getCreateTime()));
458   - map.put("name", s.getName());
459   - map.put("place", s.getPlace());
460   -
461   - for (Object constObj : constructionList) {
462   - JSONObject constJSON = (JSONObject) constObj;
463   -
464   - if (!s.getObjectId().equals(constJSON.getString("id")))
465   - continue;
466   - else {
467   - map.put("address", constJSON.getString("address"));
468   - map.put("siteInvestmentTypeName", constJSON.getString("siteInvestmentTypeName"));
469   - map.put("workAreaCodeName", constJSON.getString("workAreaCodeName"));
470   - break;
471   - }
  367 + if (areaCode.equals(area.getString("code"))) {
  368 + areaCode = area.getString("name");
472 369 }
473   -
474   - map.put("status", "开工");
475   - map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
476   - map.put("objectId", s.getObjectId());
477   - map.put("type", "");
478   - map.put("eid", e.getObjectId());
479   - map.put("ename", e.getName());
480   - map.put("eplace", e.getPlace());
481   - map.put("estatus", "开工");
482   - map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
483   - map.put("etype", "");
484   -
485   - map.put("descript", "有效开工");
486   -
487   - list.add(map);
488 370 }
489 371 }
490   - } else {
491   - for (Object object : contracts) {
492   - JSONObject jsonObject = (JSONObject) object;
493 372  
494   - if (!s.getObjectId().equals(jsonObject.getString("constructionSiteID")))
  373 + if (supervisionThreestep.getHis().equals("1")) {
  374 + if (yearFomat.format(s.getSelfCheckTime()).equals(yearFomat.format(new Date()))) {
495 375 continue;
  376 + }
  377 + }
496 378  
497   - for (SupervisionThreestep e : earthsites) {
  379 + if (s.getType() == 0) {
  380 + constructions.add(s);
  381 + } else {
  382 + earthsites.add(s);
  383 + }
  384 + }
498 385  
499   - if (!supervisionThreestep.getHis().equals("1")
500   - && !e.getObjectId().equals(jsonObject.getString("earthSiteID")))
501   - continue;
  386 + for (SupervisionThreestep s : constructions) {
  387 + if (supervisionThreestep.getHis().equals("1")) {
  388 + for (SupervisionThreestep e : earthsites) {
502 389  
503   - if (supervisionThreestep.getHis().equals("1") && !s.getEarthsitesId().contains(e.getObjectId()))
  390 + if (!s.getEarthsitesId().contains(e.getObjectId()))
504 391 continue;
505 392  
506 393 if (yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))) {
... ... @@ -514,6 +401,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
514 401 map.put("createTime", yearFomat.format(s.getCreateTime()));
515 402 map.put("name", s.getName());
516 403 map.put("place", s.getPlace());
  404 +
517 405 for (Object constObj : constructionList) {
518 406 JSONObject constJSON = (JSONObject) constObj;
519 407  
... ... @@ -526,6 +414,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
526 414 break;
527 415 }
528 416 }
  417 +
529 418 map.put("status", "开工");
530 419 map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
531 420 map.put("objectId", s.getObjectId());
... ... @@ -542,10 +431,73 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
542 431 list.add(map);
543 432 }
544 433 }
  434 +
  435 +
  436 + redisCache.setCacheObject("dayWorkList", list, 1, TimeUnit.DAYS);
  437 + } else {
  438 + for (Object object : contracts) {
  439 + JSONObject jsonObject = (JSONObject) object;
  440 +
  441 + if (!s.getObjectId().equals(jsonObject.getString("constructionSiteID")))
  442 + continue;
  443 +
  444 + for (SupervisionThreestep e : earthsites) {
  445 +
  446 + if (!supervisionThreestep.getHis().equals("1")
  447 + && !e.getObjectId().equals(jsonObject.getString("earthSiteID")))
  448 + continue;
  449 +
  450 + if (supervisionThreestep.getHis().equals("1") && !s.getEarthsitesId().contains(e.getObjectId()))
  451 + continue;
  452 +
  453 + if (yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))) {
  454 +
  455 + if (s.getStatus() != 1 || e.getStatus() != 1) {
  456 + continue;
  457 + }
  458 +
  459 + Map<String, String> map = new HashMap<String, String>();
  460 + map.put("id", s.getId() + "");
  461 + map.put("createTime", yearFomat.format(s.getCreateTime()));
  462 + map.put("name", s.getName());
  463 + map.put("place", s.getPlace());
  464 + for (Object constObj : constructionList) {
  465 + JSONObject constJSON = (JSONObject) constObj;
  466 +
  467 + if (!s.getObjectId().equals(constJSON.getString("id")))
  468 + continue;
  469 + else {
  470 + map.put("address", constJSON.getString("address"));
  471 + map.put("siteInvestmentTypeName", constJSON.getString("siteInvestmentTypeName"));
  472 + map.put("workAreaCodeName", constJSON.getString("workAreaCodeName"));
  473 + break;
  474 + }
  475 + }
  476 + map.put("status", "开工");
  477 + map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
  478 + map.put("objectId", s.getObjectId());
  479 + map.put("type", "");
  480 + map.put("eid", e.getObjectId());
  481 + map.put("ename", e.getName());
  482 + map.put("eplace", e.getPlace());
  483 + map.put("estatus", "开工");
  484 + map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
  485 + map.put("etype", "");
  486 +
  487 + map.put("descript", "有效开工");
  488 +
  489 + list.add(map);
  490 + }
  491 + }
  492 + }
545 493 }
  494 +
546 495 }
547 496  
548 497 }
  498 +
  499 +
  500 +
549 501  
550 502 List FilterList = new ArrayList<>();
551 503  
... ... @@ -565,8 +517,20 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
565 517 String workAreaCodeName = supervisionThreestep.getWorkAreaCodeName();
566 518  
567 519 for (Map<String, String> map : list) {
  520 + try {
  521 + long start = supervisionThreestep.getWorkStartTime().getTime();
  522 + long end = supervisionThreestep.getWorkEndTime().getTime();
  523 + long t = dateTime.parse( map.get("selfCheckTime")).getTime();
  524 + if(t < start || t > end){
  525 + continue;
  526 + }
  527 + } catch (ParseException e) {
  528 + // TODO Auto-generated catch block
  529 + e.printStackTrace();
  530 + }
  531 +
568 532 if (place != null) {
569   - if (!place.equals(map.get("place"))) {
  533 + if (!place.contains(map.get("place"))) {
570 534 continue;
571 535 }
572 536 }
... ... @@ -576,7 +540,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
576 540 }
577 541 }
578 542 if (eplace != null) {
579   - if (!eplace.equals(map.get("eplace"))) {
  543 + if (!eplace.contains(map.get("eplace"))) {
580 544 continue;
581 545 }
582 546 }
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
  View file @9d60e0e
... ... @@ -268,6 +268,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
268 268  
269 269 if(array == null)
270 270 array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
  271 +
271 272 if(array != null) {
272 273 for(Object obj:array) {
273 274 JSONObject json = (JSONObject)obj;
... ... @@ -299,13 +300,16 @@ public class TruckCreditServiceImpl implements ITruckCreditService
299 300 redisCache.setCacheObject("deletedTrucks", delete);
300 301 }
301 302  
302   - jsonArray.addAll(delete);
303   -
304   -
305   - for(Object obj:jsonArray){
306   - JSONObject json = (JSONObject) obj;
307   - if(companys.indexOf(json.getString("companyID")) > -1){
308   - ids.add(json.getString("id"));
  303 + if(jsonArray != null){
  304 + if(delete != null)
  305 + jsonArray.addAll(delete);
  306 +
  307 +
  308 + for(Object obj:jsonArray){
  309 + JSONObject json = (JSONObject) obj;
  310 + if(companys.indexOf(json.getString("companyID")) > -1){
  311 + ids.add(json.getString("id"));
  312 + }
309 313 }
310 314 }
311 315 }
... ...
trash-workFlow/src/main/java/com/trash/workflow/listener/ConractListener.java
  View file @9d60e0e
... ... @@ -10,7 +10,9 @@ import org.activiti.engine.delegate.ExecutionListener;
10 10 import org.activiti.engine.delegate.Expression;
11 11 import org.springframework.beans.factory.annotation.Autowired;
12 12  
  13 +import com.trash.common.config.trashConfig;
13 14 import com.trash.common.utils.RemoteServerUtils;
  15 +import com.trash.common.utils.SecurityUtils;
14 16 import com.trash.common.utils.spring.SpringUtils;
15 17 import com.trash.workflow.domain.Workflow;
16 18 import com.trash.workflow.mapper.WorkflowMapper;
... ... @@ -25,7 +27,8 @@ public class ConractListener implements ExecutionListener {
25 27  
26 28 @Autowired
27 29 IWorkflowService workflowService;
28   -
  30 + @Autowired
  31 + trashConfig trashConfig;
29 32  
30 33 @Override
31 34 public void notify(DelegateExecution delegateExecution) {
... ... @@ -38,8 +41,56 @@ public class ConractListener implements ExecutionListener {
38 41 map.put("auditStatus", state.getValue(delegateExecution).toString());
39 42 maps.add(map);
40 43  
41   - Object obj = RemoteServerUtils.updateConractStatus(maps);
42   -
  44 + boolean obj = false;
  45 + try{
  46 + obj = (boolean)RemoteServerUtils.updateConractStatus(maps);
  47 + }catch(Exception e){
  48 + e.printStackTrace();
  49 + }
  50 +
  51 + if(!obj){
  52 + final String token = trashConfig.getToken();
  53 + new Thread(new Runnable() {
  54 +
  55 + @Override
  56 + public void run() {
  57 + while(true){
  58 + try {
  59 +
  60 + boolean object = false;
  61 + try{
  62 + object = (boolean)RemoteServerUtils.updateConractStatus(maps,token);
  63 + }catch(Exception e){
  64 + e.printStackTrace();
  65 + }
  66 +
  67 + try {
  68 + Thread.sleep(30000);
  69 + } catch (InterruptedException e) {
  70 + // TODO Auto-generated catch block
  71 + e.printStackTrace();
  72 + }
  73 + if(object){
  74 + break;
  75 + }
  76 +
  77 + } catch (Exception e) {
  78 + e.printStackTrace();
  79 + }
  80 +
  81 + try {
  82 + Thread.sleep(30000);
  83 + } catch (InterruptedException e) {
  84 + // TODO Auto-generated catch block
  85 + e.printStackTrace();
  86 + }
  87 +
  88 + }
  89 +
  90 + }
  91 + }).start();
  92 + }
  93 +
43 94 workflowUtils.sendDataToHisTory(delegateExecution, state,String.valueOf(obj));
44 95  
45 96  
... ...
trash-workFlow/src/main/java/com/trash/workflow/listener/ConstructionEndListener.java
  View file @9d60e0e
... ... @@ -10,7 +10,9 @@ import org.activiti.engine.delegate.ExecutionListener;
10 10 import org.activiti.engine.delegate.Expression;
11 11 import org.springframework.beans.factory.annotation.Autowired;
12 12  
  13 +import com.trash.common.config.trashConfig;
13 14 import com.trash.common.utils.RemoteServerUtils;
  15 +import com.trash.common.utils.SecurityUtils;
14 16 import com.trash.common.utils.spring.SpringUtils;
15 17 import com.trash.workflow.domain.Workflow;
16 18 import com.trash.workflow.mapper.WorkflowMapper;
... ... @@ -27,6 +29,9 @@ public class ConstructionEndListener implements ExecutionListener {
27 29  
28 30 @Autowired
29 31 IWorkflowService workflowService;
  32 +
  33 + @Autowired
  34 + trashConfig trashConfig;
30 35  
31 36  
32 37 @Override
... ... @@ -40,8 +45,54 @@ public class ConstructionEndListener implements ExecutionListener {
40 45 map.put("auditStatus", state.getValue(delegateExecution).toString());
41 46 maps.add(map);
42 47  
43   - Object obj = RemoteServerUtils.updateConstationCreditAndStatus(maps);
44   -
  48 + boolean obj = false;
  49 + try{
  50 + obj = (boolean)RemoteServerUtils.updateConstationCreditAndStatus(maps);
  51 + }catch(Exception e){
  52 + e.printStackTrace();
  53 + }
  54 + if(!obj){
  55 + final String token = trashConfig.getToken();;
  56 + new Thread(new Runnable() {
  57 +
  58 + @Override
  59 + public void run() {
  60 + while(true){
  61 + try {
  62 +
  63 + boolean object = false;
  64 + try{
  65 + object = (boolean)RemoteServerUtils.updateConstationCreditAndStatus(maps,token);
  66 + }catch(Exception e){
  67 + e.printStackTrace();
  68 + }
  69 + try {
  70 + Thread.sleep(30000);
  71 + } catch (InterruptedException e) {
  72 + // TODO Auto-generated catch block
  73 + e.printStackTrace();
  74 + }
  75 + if(object){
  76 + break;
  77 + }
  78 +
  79 + } catch (Exception e) {
  80 + e.printStackTrace();
  81 + }
  82 +
  83 + try {
  84 + Thread.sleep(30000);
  85 + } catch (InterruptedException e) {
  86 + // TODO Auto-generated catch block
  87 + e.printStackTrace();
  88 + }
  89 +
  90 + }
  91 +
  92 + }
  93 + },"conThread").start();
  94 + }
  95 +
45 96 workflowUtils.sendDataToHisTory(delegateExecution, state,String.valueOf(obj));
46 97  
47 98  
... ...
trash-workFlow/src/main/java/com/trash/workflow/listener/EarthSitesEndStateListener.java
  View file @9d60e0e
... ... @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
13 13  
14 14 import com.alibaba.fastjson.JSON;
15 15 import com.alibaba.fastjson.JSONObject;
  16 +import com.trash.common.config.trashConfig;
16 17 import com.trash.common.core.domain.model.LoginUser;
17 18 import com.trash.common.utils.RemoteServerUtils;
18 19 import com.trash.common.utils.SecurityUtils;
... ... @@ -29,6 +30,8 @@ public class EarthSitesEndStateListener implements ExecutionListener {
29 30  
30 31 private Expression state;
31 32  
  33 + @Autowired
  34 + trashConfig trashConfig;
32 35  
33 36 @Override
34 37 public void notify(DelegateExecution delegateExecution) {
... ... @@ -41,8 +44,55 @@ public class EarthSitesEndStateListener implements ExecutionListener {
41 44 map.put("auditStatus", state.getValue(delegateExecution).toString());
42 45 maps.add(map);
43 46  
44   - Object obj = RemoteServerUtils.updateEarthSitesCreditAndStatus(maps);
45   -
  47 + boolean obj = false;
  48 + try{
  49 + obj = (boolean)RemoteServerUtils.updateEarthSitesCreditAndStatus(maps);
  50 + }catch(Exception e){
  51 + e.printStackTrace();
  52 + }
  53 +
  54 + if(!obj){
  55 + final String token = trashConfig.getToken();;
  56 + new Thread(new Runnable() {
  57 +
  58 + @Override
  59 + public void run() {
  60 + while(true){
  61 + try {
  62 +
  63 + boolean object = false;
  64 + try{
  65 + object = (boolean)RemoteServerUtils.updateEarthSitesCreditAndStatus(maps,token);
  66 + }catch(Exception e){
  67 + e.printStackTrace();
  68 + }
  69 + try {
  70 + Thread.sleep(30000);
  71 + } catch (InterruptedException e) {
  72 + // TODO Auto-generated catch block
  73 + e.printStackTrace();
  74 + }
  75 + if(object){
  76 + break;
  77 + }
  78 +
  79 + } catch (Exception e) {
  80 + e.printStackTrace();
  81 + }
  82 +
  83 + try {
  84 + Thread.sleep(30000);
  85 + } catch (InterruptedException e) {
  86 + // TODO Auto-generated catch block
  87 + e.printStackTrace();
  88 + }
  89 +
  90 + }
  91 +
  92 + }
  93 + }).start();
  94 + }
  95 +
46 96 workflowUtils.sendDataToHisTory(delegateExecution, state,String.valueOf(obj));
47 97  
48 98 System.out.println("流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey() + "状态:" + state.getValue(delegateExecution).toString());
... ...
trash-workFlow/src/main/java/com/trash/workflow/listener/baseDataListener.java
  View file @9d60e0e
... ... @@ -4,6 +4,7 @@ import com.trash.office.domain.Conference;
4 4 import com.trash.office.mapper.ConferenceMapper;
5 5 import com.trash.workflow.mapper.WorkflowMapper;
6 6 import com.alibaba.fastjson.JSONObject;
  7 +import com.trash.common.config.trashConfig;
7 8 import com.trash.common.utils.RemoteServerUtils;
8 9 import com.trash.common.utils.SecurityUtils;
9 10 import com.trash.common.utils.spring.SpringUtils;
... ... @@ -18,6 +19,7 @@ import org.activiti.engine.delegate.ExecutionListener;
18 19 import org.activiti.engine.delegate.Expression;
19 20 import org.slf4j.Logger;
20 21 import org.slf4j.LoggerFactory;
  22 +import org.springframework.beans.factory.annotation.Autowired;
21 23  
22 24  
23 25 public class baseDataListener implements ExecutionListener {
... ... @@ -25,6 +27,9 @@ public class baseDataListener implements ExecutionListener {
25 27  
26 28 private static final Logger log = LoggerFactory.getLogger(baseDataListener.class);
27 29  
  30 + @Autowired
  31 + trashConfig trashConfig;
  32 +
28 33 @Override
29 34 public void notify(DelegateExecution delegateExecution) {
30 35  
... ... @@ -57,7 +62,7 @@ public class baseDataListener implements ExecutionListener {
57 62  
58 63  
59 64 if(!object){
60   - final String token = "auth:token:" + SecurityUtils.getLoginUser().getToken();
  65 + final String token = trashConfig.getToken();
61 66 new Thread(new Runnable() {
62 67  
63 68 @Override
... ... @@ -78,7 +83,7 @@ public class baseDataListener implements ExecutionListener {
78 83  
79 84 try {
80 85 log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
81   - Thread.sleep(3000);
  86 + Thread.sleep(30000);
82 87 } catch (InterruptedException e) {
83 88 // TODO Auto-generated catch block
84 89 e.printStackTrace();
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @9d60e0e
... ... @@ -119,7 +119,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
119 119  
120 120 String businessKey = flowType + ":" + map.get("id"); // 流程对应事务key
121 121 String title = map.get("title").toString();
122   -
123 122 String reason = map.get("reason").toString();
124 123 String startTime = map.get("startTime").toString();
125 124 String endTime = map.get("endTime").toString();
... ... @@ -170,8 +169,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
170 169  
171 170 constructionSign.setObjectId(map.get("id").toString());
172 171  
173   -
174   -
175 172 if (!user.getAvatar().contains("null")) {
176 173 constructionSign.setSign1(SecurityUtils.getLoginUser().getUser().getAvatar());
177 174 constructionSign.setSign1Time(new Date());
... ...
trash-workFlow/src/main/resources/mapper/ConstructionCreditMapper.xml
  View file @9d60e0e
... ... @@ -97,7 +97,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
97 97 </delete>
98 98  
99 99 <select id="getNames" parameterType="ConstructionCredit" resultType="String">
100   -
101 100 select DISTINCT name from construction_credit
102 101 <where>
103 102 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
... ... @@ -125,13 +124,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
125 124  
126 125  
127 126 <select id="selectConstructionCreditHistory" parameterType="ConstructionCredit" resultMap="ConstructionCreditResult">
128   -
129   - select c.* from (select a.* from construction_credit a where not exists (select b.* from construction_credit b where a.name = b.name and a.id &lt; id )) c
130   -
  127 + SELECT t1.*
  128 + FROM construction_credit t1
  129 + INNER JOIN (
  130 + SELECT name, MAX(id) as max_id
  131 + FROM construction_credit
  132 + GROUP BY name
  133 + ) t2 ON t1.name = t2.name AND t1.id = t2.max_id
131 134 <where>
132   - <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
133   - <if test="type != null and type != ''"> and type = #{type}</if>
134   - <if test="place != null and place != ''"> and place = #{place}</if>
  135 + <if test="name != null and name != ''"> and t1.name like concat('%', #{name}, '%')</if>
  136 + <if test="type != null and type != ''"> and t1.type = #{type}</if>
  137 + <if test="place != null and place != ''"> and t1.place = #{place}</if>
135 138 <if test="ids != null ">
136 139 and object_id in
137 140 <foreach item="id" collection="ids" open="(" separator="," close=")">
... ... @@ -139,6 +142,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
139 142 </foreach>
140 143 </if>
141 144 </where>
  145 +
  146 + ORDER BY id desc
142 147 </select>
143 148  
144 149 </mapper>
145 150 \ No newline at end of file
... ...
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
  View file @9d60e0e
... ... @@ -135,7 +135,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
135 135 <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
136 136 <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
137 137 #{workEndTime}</if>
138   -
  138 +
  139 + <if test="places != null and places.length > 0">
  140 + and place in
  141 + <foreach item="place" collection="places" open="(" separator=","
  142 + close=")">
  143 + #{place}
  144 + </foreach>
  145 + </if>
139 146 <if test="ids != null">
140 147 and object_id in
141 148 <foreach item="id" collection="ids" open="(" separator=","
... ...
trash-workFlow/src/main/resources/mapper/TruckCreditMapper.xml
  View file @9d60e0e
... ... @@ -129,18 +129,25 @@
129 129  
130 130 <select id="selectTruckCreditHistory" parameterType="TruckCredit" resultMap="TruckCreditResult">
131 131  
132   - select c.* from (select a.* from truck_credit a where not exists (select b.* from truck_credit b where a.license_plate = b.license_plate and a.id &lt; id )) c
133   -
  132 + SELECT t1.*
  133 + FROM truck_credit t1
  134 + INNER JOIN (
  135 + SELECT license_plate, MAX(id) as max_id
  136 + FROM truck_credit
  137 + GROUP BY license_plate
  138 + ) t2 ON t1.license_plate = t2.license_plate AND t1.id = t2.max_id
134 139 <where>
135   - <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%')</if>
136   - <if test="licensePlate != null and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if>
137   - <if test="ids != null ">
138   - and object_id in
  140 + <if test="companyId != null and companyId != ''"> and t1.company_id like concat('%',#{companyId},'%')</if>
  141 + <if test="licensePlate != null and licensePlate != ''"> and t1.license_plate like concat('%', #{licensePlate}, '%')</if>
  142 + <if test="ids != null and ids.size() > 0">
  143 + and t1.object_id in
139 144 <foreach item="id" collection="ids" open="(" separator="," close=")">
140 145 #{id}
141 146 </foreach>
142 147 </if>
143 148 </where>
  149 +
  150 + ORDER BY id desc
144 151 </select>
145 152  
146 153 </mapper>
147 154 \ No newline at end of file
... ...
trash-workFlow/src/main/resources/mapper/caseOffline/CaseOfflineMapper.xml
  View file @9d60e0e
... ... @@ -36,7 +36,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
36 36 <where>
37 37 <if test="status1 != null "> ${status1}</if>
38 38 <if test="type != null and type != ''"> and type = #{type}</if>
39   - <if test="place != null and place != ''"> and place = #{place}</if>
  39 + <if test="place != null and place != ''">and LOCATE(place , #{place}) > 0</if>
40 40 <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
41 41 <if test="names != null and names.size() > 0">
42 42 and site_name in
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
  View file @9d60e0e
... ... @@ -44,7 +44,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
44 44 <where>
45 45 <if test="number != null and number != ''"> and number = #{number}</if>
46 46 <if test="violationObjectType != null and violationObjectType != ''"> and violation_object_type = #{violationObjectType}</if>
47   - <if test="owningRegion != null and owningRegion != ''"> and owning_region like concat('%', #{owningRegion}, '%')</if>
  47 + <if test="owningRegion != null and owningRegion != ''">and LOCATE(owning_region , #{owningRegion}) > 0</if>
48 48 <if test="violationType != null and violationType != ''"> and violation_type = #{violationType}</if>
49 49 <if test="violationGrade != null and violationGrade != ''"> and violation_grade = #{violationGrade}</if>
50 50 <if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
... ... @@ -77,7 +77,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
77 77 <select id="selectViolationCaseFileListByTable" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
78 78 <include refid="selectViolationCaseFileVo"/>
79 79 <where>
80   - <if test="owningRegion != null and owningRegion != ''">and owning_region = #{owningRegion}</if>
  80 + <if test="owningRegion != null and owningRegion != ''">and LOCATE(owning_region , #{owningRegion}) > 0</if>
81 81 <if test="startDate!=null and endDate!=null and startDate!='' and endDate!=''">and create_time between #{startDate} and #{endDate}</if>
82 82 </where>
83 83 </select>
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
  View file @9d60e0e
... ... @@ -41,7 +41,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
41 41 <where>
42 42 <if test="number != null and number != ''"> and `number` = #{number}</if>
43 43 <if test="violationObjectType != null and violationObjectType != ''"> and violation_object_type = #{violationObjectType}</if>
44   - <if test="owningRegion != null and owningRegion != ''"> and owning_region = #{owningRegion}</if>
  44 + <if test="owningRegion != null and owningRegion != ''"> and LOCATE(owning_region , #{owningRegion}) > 0</if>
45 45 <if test="violationType != null and violationType != ''"> and violation_type = #{violationType}</if>
46 46 <if test="violationGrade != null and violationGrade != ''"> and violation_grade = #{violationGrade}</if>
47 47 <if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
... ... @@ -65,7 +65,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
65 65 <select id="selectViolationWarningInformationListByTable" parameterType="ViolationWarningInformation" resultMap="ViolationWarningInformationResult">
66 66 <include refid="selectViolationWarningInformationVo"/>
67 67 <where>
68   - <if test="owningRegion != null and owningRegion != ''">and owning_region = #{owningRegion}</if>
  68 + <if test="owningRegion != null and owningRegion != ''">and LOCATE(owning_region , #{owningRegion}) > 0</if>
69 69 <if test="startDate!=null and endDate!=null and startDate!='' and endDate!=''">and create_time between #{startDate} and #{endDate}</if>
70 70 </where>
71 71 </select>
... ...