youxiw2000 / trash · Commits

Commit 04f65edd949de329a4f4c63431114c022d5edfd7

Authored by youxiw2000
1 parent c9e9108d
build: skipped

m

Inline Side-by-side
Showing 11 changed files with 208 additions and 308 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
  View file @04f65ed
... ... @@ -43,6 +43,16 @@ public class TaskController extends BaseController {
43 43 List<String> names = actReDeploymentMapper.selectTitles();
44 44  
45 45 TableDataInfo tableDataInfo = getDataTable(hashMaps);
  46 +
  47 + int pageNum = pageDomain.getPageNum();
  48 + int pageSize = pageDomain.getPageSize();
  49 +
  50 + if(tableDataInfo.getRows().size() > (pageNum)*pageSize){
  51 + tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, (pageNum)*pageSize));
  52 + }else{
  53 + tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, tableDataInfo.getRows().size()));
  54 + }
  55 +
46 56 tableDataInfo.setNames(names);
47 57  
48 58 return tableDataInfo;
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @04f65ed
... ... @@ -104,7 +104,7 @@ public class ActTaskServiceImpl implements IActTaskService {
104 104  
105 105  
106 106  
107   - org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
  107 + org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of(0,999999));
108 108  
109 109 List<Task> tasks = pageTasks.getContent();
110 110 int totalItems = pageTasks.getTotalItems();
... ...
trash-admin/src/main/resources/application-dev.yml
  View file @04f65ed
... ... @@ -16,10 +16,11 @@ trash:
16 16 # 验证码类型 math 数组计算 char 字符验证
17 17 captchaType: math
18 18 # 远程服务器地址
19   -# remotePath: http://183.66.242.6:6001
  19 + #remotePath: http://175.6.47.84:8008
  20 + #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
20 21 remotePath: http://183.66.242.6:14601
21   - token: auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjoxNjg2MjcwMTcyLCJjcmVhdGVkIjoxNjg2MjEwMTcyODk2fQ.T_azsalyEnb1dukZ0CghG2GfQt3M41zwi18sutPXhjM8hYfca74WWJT6kXETFaUbOHICWp-OcEqydHhVE-Ewjg
22   -
  22 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  23 +
23 24 # 数据源配置
24 25 spring:
25 26 datasource:
... ... @@ -30,7 +31,7 @@ spring:
30 31 master:
31 32 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
32 33 username: root
33   - password: asd0731.
  34 + password: root
34 35 # 从库数据源
35 36 slave:
36 37 # 从数据源开关/默认关闭
... ... @@ -84,7 +85,7 @@ spring:
84 85 # 端口，默认为6379
85 86 port: 6379
86 87 # 密码
87   - password: bsth123
  88 + password:
88 89 # 连接超时时间
89 90 timeout: 10s
90 91 database: 10
... ...
trash-admin/src/main/resources/logback.xml
  View file @04f65ed
... ... @@ -2,7 +2,7 @@
2 2 <configuration>
3 3 <!-- 日志存放路径 -->
4 4 <!-- <property name="log.path" value="/home/trash/logs" />-->
5   - <property name="log.path" value="D:/work/project/logs/trash" />
  5 + <property name="log.path" value="C:/work/project/logs/trash" />
6 6 <!-- 日志输出格式 -->
7 7 <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
8 8  
... ... @@ -11,6 +11,14 @@
11 11 <encoder>
12 12 <pattern>${log.pattern}</pattern>
13 13 </encoder>
  14 + <filter class="ch.qos.logback.classic.filter.LevelFilter">
  15 + <!-- 过滤的级别 -->
  16 + <level>ERROR</level>
  17 + <!-- 匹配时的操作：接收（记录） -->
  18 + <onMatch>ACCEPT</onMatch>
  19 + <!-- 不匹配时的操作：拒绝（不记录） -->
  20 + <onMismatch>DENY</onMismatch>
  21 + </filter>
14 22 </appender>
15 23  
16 24 <!-- 系统日志输出 -->
... ... @@ -28,7 +36,7 @@
28 36 </encoder>
29 37 <filter class="ch.qos.logback.classic.filter.LevelFilter">
30 38 <!-- 过滤的级别 -->
31   - <level>INFO</level>
  39 + <level>ERROR</level>
32 40 <!-- 匹配时的操作：接收（记录） -->
33 41 <onMatch>ACCEPT</onMatch>
34 42 <!-- 不匹配时的操作：拒绝（不记录） -->
... ...
trash-ui/src/api/dayWorkReport.js
  View file @04f65ed
... ... @@ -8,7 +8,14 @@ import {
8 8 } from "@/api/business/daywork";
9 9  
10 10 import {
11   - postThreestep,
  11 + listThreestep,
  12 + getThreestep,
  13 + delThreestep,
  14 + addThreestep,
  15 + updateThreestep,
  16 + exportThreestep,
  17 + getNames,
  18 + postThreestep
12 19 } from "@/api/business/threestep";
13 20  
14 21  
... ... @@ -250,7 +257,6 @@ export default {
250 257 });
251 258 } else {
252 259 exportDayWorkList(data).then(res => {
253   -
254 260 console.log(page);
255 261 this.queryParams.page = page;
256 262 console.log(size);
... ... @@ -288,6 +294,9 @@ export default {
288 294 this.queryParams.his = tabIdx;
289 295 }
290 296  
  297 +
  298 +
  299 +
291 300 const timeRange = this.queryParams.timeRange;
292 301 if (this.queryParams.timeRange) {
293 302 this.queryParams.workStartTime = this.queryParams.timeRange[0];
... ... @@ -295,6 +304,29 @@ export default {
295 304 this.queryParams.timeRange = null;
296 305 }
297 306  
  307 + if (tabIdx > 1 || this.queryParams.his > 1) {
  308 + this.queryParams.his = tabIdx;
  309 + this.queryParams.status = 1;
  310 + if(tabIdx == 2){
  311 + this.queryParams.type = 0;
  312 + }else{
  313 + this.queryParams.type = 1;
  314 + }
  315 +
  316 + listThreestep(this.queryParams).then(response => {
  317 + this.threestepList = response.rows;
  318 + this.total = response.total;
  319 +
  320 + this.loading.close();
  321 +
  322 + for (let i = 0; i < this.threestepList.length; i++) {
  323 + this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
  324 + }
  325 + });
  326 + return;
  327 + }
  328 +
  329 +
298 330 dayWorkList(this.queryParams).then(response => {
299 331 this.threestepList = response.rows;
300 332  
... ... @@ -482,6 +514,24 @@ export default {
482 514 },
483 515 /** 导出按钮操作 */
484 516 handleExport() {
  517 + if(this.queryParams.his > 1){
  518 + const queryParams = this.queryParams;
  519 + this.$confirm('是否确认导出所有报工数据项?', "警告", {
  520 + confirmButtonText: "确定",
  521 + cancelButtonText: "取消",
  522 + type: "warning"
  523 + }).then(function () {
  524 + return exportThreestep(queryParams);
  525 + }).then(response => {
  526 + this.download(response.message);
  527 + })
  528 +
  529 + return;
  530 + }
  531 +
  532 +
  533 +
  534 +
485 535 let curPage = this.queryParams.page;
486 536 let curSize = this.queryParams.pageSize;
487 537 let that = this;
... ...
trash-ui/src/api/dict.js
  View file @04f65ed
... ... @@ -52,15 +52,6 @@ export function updateEarthsites(data) {
52 52 }
53 53  
54 54  
55   -
56   -
57   -export function mainworkcompany(id) {
58   - return requestRemote({
59   - url: '/api/siteservice/cs/constructionsites/' + id,
60   - method: 'get',
61   - });
62   -}
63   -
64 55 export function companyList(data) {
65 56 return requestRemote({
66 57 url: '/api/gpsservice/cs/companies/ledger/list',
... ...
trash-ui/src/api/three_step.js
  View file @04f65ed
... ... @@ -10,7 +10,6 @@ import {
10 10  
11 11  
12 12 import threestepInfo from "@/views/business/threestep/threestepInfo";
13   -
14 13 import h5Info from "@/views/h5/task/threestepInfo";
15 14 import h5Page from '@/views/h5/Pagination';
16 15  
... ... @@ -26,11 +25,12 @@ import {
26 25 constructionsitesList,
27 26 getDict,
28 27 getArea,
29   - mainworkcompany,
30 28 truckList,
31 29 companyList,
32 30 contractList,
33 31 getConstructionTruck,
  32 + constructionById,
  33 + earthsitesById,
34 34 } from "@/api/dict";
35 35  
36 36 export default {
... ... @@ -38,7 +38,6 @@ export default {
38 38 components: {
39 39 threestepInfo,
40 40 h5Info,
41   -
42 41 h5Page
43 42 },
44 43 data() {
... ... @@ -213,8 +212,6 @@ export default {
213 212 break;
214 213 }
215 214 }
216   -
217   -
218 215 if (new Date(item.endTime).getTime() < new Date().getTime()) {
219 216 this.form.contract = null;
220 217 this.$message("合同已过期");
... ... @@ -275,16 +272,6 @@ export default {
275 272 }
276 273  
277 274 this.form.companyTrucks = arr;
278   - // for(let i = 0;)
279   -
280   - // let arr = [];
281   - // for(var i in this.form.companyTrucks){
282   - // if(this.form.companys.indexOf(this.form.companyTrucks[i]) > -1){
283   - // arr.push(this.form.companyTrucks[i]);
284   - // }
285   - // }
286   -
287   - // this.form.companyTrucks = arr;
288 275 },
289 276  
290 277 areaClear() {
... ... @@ -302,56 +289,22 @@ export default {
302 289 break;
303 290 }
304 291 }
305   - this.form.earthsitesName = null;
306   - this.form.earthsitesId = null;
307   - this.form.contract = null;
308   - this.form.contractId = null;
309   - this.bindname = null;
310 292  
311   - let name = this.form.earthsitesName;
312   - let objId = this.form.earthsitesId;
313 293  
314 294 this.form.objectId = item.id;
315 295 this.form.place = Number(item.areaCode);
316   - this.filterConract();
317   -
318   - if (this.filterContract.length == 0) {
319   - this.$message("未找到对应消纳合同");
320   - this.form.objectId = null;
321   - this.form.name = null;
322   - }
323   -
324   - this.filterConract();
325   -
326   - for (let i in this.filterContract) {
327   - if (this.filterContract[i].constructionSiteID == objId || this.filterContract[i].earthSiteID == objId) {
328   - this.form.earthsitesName = name;
329   - this.form.earthsitesId = objId;
330   - break;
331   - }
332   - }
333   -
334   - if (this.form.type == 0) {
335   - let query = {
336   - 'page': 1,
337   - 'size': 9999,
338   - }
339 296  
  297 + if(this.form.type == 1)
  298 + return;
340 299  
341   - this.filterCompany(item);
342   - }
343 300  
344   - },
345   - filterCompany(item) {
346 301 this.form.companys = null;
347 302 this.form.companyTrucks = null;
348 303 this.companyList = [];
349 304 this.truckList = [];
350 305  
351   - mainworkcompany(item.id).then(response => {
352   -
  306 + constructionById(item.id).then(response => {
353 307 this.companyList.push({id: item.transportCompanyId, name: item.transportCompany});
354   -
355 308 let query = {
356 309 'page': 1,
357 310 'size': 9999,
... ... @@ -382,99 +335,9 @@ export default {
382 335 this.truckList.push(res.result.list[i]);
383 336 }
384 337 });
385   -
386 338 });
387 339 });
388 340 },
389   - filterConract() {
390   - let cId;
391   - let eId;
392   - if (this.form.type == 0) {
393   - cId = this.form.objectId;
394   - eId = this.form.earthsitesId;
395   - } else {
396   - cId = this.form.earthsitesId;
397   - eId = this.form.objectId;
398   - }
399   -
400   - this.filterContract = [];
401   - for (let i in this.contractList) {
402   - let obj = this.contractList[i];
403   - let canId = true;
404   -
405   -
406   - //constructionSiteID //earthSiteID
407   - if (cId && cId != obj.constructionSiteID) {
408   - continue;
409   - }
410   -
411   - if (eId && eId != obj.earthSiteID) {
412   - continue;
413   - }
414   -
415   - this.filterContract.push(obj);
416   - }
417   -
418   -
419   - for (let j in this.bindData) {
420   -
421   - this.bindData[j].show = false;
422   -
423   - for (let i in this.filterContract) {
424   -
425   - if (this.form.type == 0 && this.filterContract[i].earthSiteID == this.bindData[j].id) {
426   - this.bindData[j].show = true;
427   - }
428   -
429   - if (this.form.type == 1 && this.filterContract[i].constructionSiteID == this.bindData[j].id) {
430   - this.bindData[j].show = true;
431   - }
432   -
433   - }
434   - }
435   - },
436   - getEarthsiteId(value) {
437   -
438   - this.form.contract = null;
439   - this.form.contractId = null;
440   -
441   - let name = this.form.name;
442   - let objId = this.form.objectId;
443   -
444   - this.form.name = null;
445   - this.form.objectId = null;
446   -
447   -
448   - let item;
449   - for (let i in this.bindData) {
450   - if (this.bindData[i].name == value) {
451   - item = this.bindData[i];
452   - break;
453   - }
454   - }
455   -
456   - this.form.earthsitesName = item.name;
457   - this.form.earthsitesId = item.id;
458   - this.filterConract();
459   -
460   - if (this.filterContract.length == 0) {
461   - this.form.earthSiteName = null;
462   - this.form.earthSiteID = null;
463   - this.$message("未找到对应消纳合同!!");
464   - }
465   -
466   - this.filterConract();
467   -
468   - for (let i in this.filterContract) {
469   - if (this.filterContract[i].constructionSiteID == objId || this.filterContract[i].earthSiteID == objId) {
470   - this.form.name = name;
471   - this.form.objectId = objId;
472   - break;
473   - }
474   - }
475   -
476   -
477   - },
478 341 downloadFile(path) {
479 342 window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
480 343 },
... ... @@ -558,43 +421,25 @@ export default {
558 421  
559 422 this.rules.companys[0].required = false;
560 423 this.rules.companyTrucks[0].required = false;
  424 +
  425 + this.form.name = null;
  426 + this.bindname = null;
  427 +
561 428 if (value == "0") {
562 429 this.labelName = "工地名称";
563   - this.labelName2 = "绑定处理场所";
  430 + constructionsitesList(this.remoteQueryData).then(res => {
  431 + this.remoteData = res.result.list;
  432 + this.rules.companys[0].required = true;
  433 + this.rules.companyTrucks[0].required = true;
564 434  
  435 + });
565 436 } else {
566 437 this.labelName = "处理场所名称";
567   - this.labelName2 = "绑定工地";
568   - }
569   -
570   - this.form.name = null;
571   - this.bindname = null;
572   - constructionsitesList(this.remoteQueryData).then(res => {
573   - if (value == 0) {
574   - this.remoteData = res.result.list;
575   - } else {
576   - this.bindData = res.result.list;
577   -
578   - for (let i in this.bindData) {
579   - this.bindData[i].show = true;
580   - }
581   - }
582   - });
583   -
584   - earthsitesList(this.remoteQueryData).then(res => {
585   - if (value == 0) {
586   - this.bindData = res.result.list;
587   - for (let i in this.bindData) {
588   - this.bindData[i].show = true;
589   - }
590   - this.rules.companys[0].required = true;
591   - this.rules.companyTrucks[0].required = true;
592   - } else {
593   - this.remoteData = res.result.list;
  438 + earthsitesList(this.remoteQueryData).then(res => {
  439 + this.remoteData = res.result.list;
  440 + });
594 441 }
595   - });
596 442 },
597   -
598 443 getAreaName(code) {
599 444 for (let i = 0; i < this.areas.length; i++) {
600 445 if (Number(code) == this.areas[i].code) {
... ... @@ -604,7 +449,6 @@ export default {
604 449 }
605 450 return code;
606 451 },
607   -
608 452 /** 查询报工自查列表 */
609 453 getList(tabIdx) {
610 454 if (tabIdx == 1) {
... ... @@ -636,7 +480,6 @@ export default {
636 480  
637 481 contractList(query).then(res => {
638 482 this.contractList = res.result.list;
639   - this.filterContract = this.contractList
640 483 });
641 484  
642 485 this.loading = true;
... ... @@ -688,7 +531,6 @@ export default {
688 531 phone: null
689 532 };
690 533 this.resetForm("form");
691   - this.filterConract();
692 534 },
693 535 /** 搜索按钮操作 */
694 536 handleQuery() {
... ... @@ -773,10 +615,44 @@ export default {
773 615 },
774 616 /** 提交按钮 */
775 617 submitForm() {
776   -
777 618 this.$refs["form"].validate(valid => {
778 619 if (valid) {
  620 +
  621 + if(this.form.type == 0){
  622 + let racts = [];
  623 + let ractsName = [];
  624 + let earthIds = [];
  625 + let earthNames = [];
  626 +
  627 + for(let i in this.contractList){
  628 + if(this.contractList[i].constructionSiteID == this.form.objectId){
  629 + racts.push(this.contractList[i].id);
  630 + ractsName.push(this.contractList[i].contractNo);
  631 + earthIds.push(this.contractList[i].earthSiteID);
  632 + earthNames.push(this.contractList[i].earthSiteName);
  633 + }
  634 + }
  635 +
  636 + this.form.earthsitesId = earthIds + "";
  637 + this.form.earthsitesName = earthNames + "";
  638 + this.form.contract = ractsName + "";
  639 + this.form.contractId = racts + "";
  640 + }
  641 + // else{
  642 + // for(let i in this.contractList){
  643 + // if(this.contractList[i].earthSiteID == this.form.objectId){
  644 + // let item = this.contractList[i];
  645 + // this.form.contract = item.contractNo;
  646 + // this.form.contractId = item.id;
  647 + // this.form.earthsitesId = item.constructionSiteID;
  648 + // this.form.earthsitesName = item.constructionSiteName;
  649 + // break;
  650 + // }
  651 + // }
  652 + // }
  653 +
779 654 this.loading = true;
  655 +
780 656 if (this.form.id != null) {
781 657 if (this.queryParams.pageStatus == 1) {
782 658 updateThreestep(this.form).then(response => {
... ... @@ -802,6 +678,7 @@ export default {
802 678 this.form.companys = this.form.companys + "";
803 679 this.form.companyTrucks = this.form.companyTrucks + "";
804 680  
  681 +
805 682 for (let i = 0; i < 13; i++) {
806 683 if (this.form["img" + i]) {
807 684 this.form["img" + i] = this.form["img" + i] + "";
... ...
trash-ui/src/views/activiti/task/companyInfo.vue
  View file @04f65ed
... ... @@ -50,16 +50,25 @@
50 50  
51 51 <div v-for="dict in dicts">
52 52 <p >{{dict.name}}</p>
53   - <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;" v-if="item.typeCode == dict.code"><p>{{item.name}}</p></a>
  53 + <el-image v-for="item in infoData.attachmentList"
  54 + style="width: 40px; height: 40px; margin: 5px;"
  55 + :src="'/remotedown/' + item.attachmentPath"
  56 + :z-index="2000"
  57 + v-if="item.typeCode == dict.code && (path.toLowerCase().indexOf(".jpg") > -1 || path.toLowerCase().indexOf(".png") > -1)">
  58 + </el-image>
  59 + <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;"
  60 + v-if="item.typeCode == dict.code
  61 + && path.toLowerCase().indexOf(".jpg") == -1
  62 + && path.toLowerCase().indexOf(".png") == -1"><p>{{item.name}}</p></a>
54 63 </div>
55   - <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
  64 + <!-- <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
56 65 <el-image
57 66 style="width: 350px; height: 350px; margin: 5px;"
58   - :src="picImage"
  67 + :src="'/remotedown/' + picImage"
59 68 :preview-src-list="[picImage]"
60 69 :z-index="2000">
61 70 </el-image>
62   - </el-dialog>
  71 + </el-dialog> -->
63 72 </div>
64 73 </div>
65 74 </template>
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @04f65ed
... ... @@ -2,11 +2,19 @@
2 2 <div class="app-container">
3 3 <el-row :gutter="10" class="mb8">
4 4 <el-col :span="1.5">
5   - <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" @click="getList(0);">报工记录</el-button>
  5 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" @click="getList(0);">有效报工记录</el-button>
6 6 </el-col>
7 7 <el-col :span="1.5">
8 8 <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini" @click="getList(1);">历史报工记录</el-button>
9 9 </el-col>
  10 +
  11 + <el-col :span="1.5">
  12 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==2}" size="mini" @click="getList(2);">工地报工记录</el-button>
  13 + </el-col>
  14 + <el-col :span="1.5">
  15 + <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==3}" size="mini" @click="getList(3);">处理场所报工记录</el-button>
  16 + </el-col>
  17 +
10 18 </el-row>
11 19  
12 20 <el-form :model="queryParams" ref="queryForm" label-width="100px">
... ... @@ -46,7 +54,7 @@
46 54 </el-row>
47 55 <el-row>
48 56 <el-col :span="6">
49   - <el-form-item label="开始时间" v-if="this.queryParams.his==1">
  57 + <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
50 58 <el-date-picker
51 59 v-model="queryParams.timeRange"
52 60 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -64,7 +72,7 @@
64 72 </el-form-item>
65 73 </el-form>
66 74  
67   - <p> {{dayWorkCount}}</p>
  75 + <p v-if="queryParams.his < 2"> {{dayWorkCount}}</p>
68 76  
69 77 <el-row :gutter="10" class="mb8">
70 78 <el-col :span="1.5">
... ... @@ -73,7 +81,7 @@
73 81 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
74 82 </el-row>
75 83  
76   - <el-table :data="threestepList" @selection-change="handleSelectionChange">
  84 + <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="!queryParams.his || queryParams.his == 1">
77 85 <el-table-column label="序号" align="center" type="index" />
78 86 <el-table-column label="日期" align="center" prop="createTime" />
79 87 <el-table-column label="工地名称" align="center" prop="name" >
... ... @@ -97,12 +105,42 @@
97 105 <el-table-column label="备注" align="center" prop="descript"/>
98 106 </el-table>
99 107  
  108 + <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="queryParams.his > 1">
  109 + <el-table-column label="序号" align="center" type='index'/>
  110 +
  111 + <el-table-column label="项目类型" align="center" prop="type">
  112 + <template slot-scope="scope">
  113 + <span>{{ scope.row.type==0?"工地":"处理场所"}}</span>
  114 + </template>
  115 + </el-table-column>
  116 + <el-table-column label="项目名称" align="center" prop="name" />
  117 +
  118 + <el-table-column label="管辖区" align="center" prop="place">
  119 + </el-table-column>
  120 +
  121 + <el-table-column label="自查时间" align="center" prop="selfCheckTime" width="180">
  122 + <template slot-scope="scope">
  123 + <span>{{scope.row.selfCheckTime}}</span>
  124 + </template>
  125 + </el-table-column>
  126 + <el-table-column label="巡查时间" align="center" prop="checkTime" width="180">
  127 + <template slot-scope="scope">
  128 + <span>{{ scope.row.checkTime}}</span>
  129 + </template>
  130 + </el-table-column>
  131 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  132 + <template slot-scope="scope">
  133 + <el-button size="mini" type="text" @click="getInfo(scope.row,0);" v-hasPermi="['business:threestep:edit']">查看详情</el-button>
  134 + </template>
  135 + </el-table-column>
  136 + </el-table>
  137 +
100 138 <el-dialog title="查看详情" width="800px" append-to-body :visible.sync="info2">
101 139 <threestepInfo :businessKey="businessKey" v-if="info2"/>
102 140 </el-dialog>
103 141  
104 142 <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
105   - @pagination="getList" />
  143 + @pagination="getList(queryParams.his)" />
106 144 </div>
107 145  
108 146 </template>
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @04f65ed
... ... @@ -120,7 +120,7 @@
120 120 </el-col>
121 121 </el-row>
122 122 <el-row type="flex" justify="center" v-if="form.type != null">
123   - <el-col :span="12">
  123 + <el-col >
124 124 <el-form-item :label="labelName" prop="name">
125 125 <el-select v-model="form.name" filterable reserve-keyword @change="getObjId">
126 126 <el-option v-for="item in remoteData" :label="item.name"
... ... @@ -129,7 +129,7 @@
129 129 </el-select>
130 130 </el-form-item>
131 131 </el-col>
132   - <el-col :span="12">
  132 + <!-- <el-col :span="12">
133 133 <el-form-item :label="labelName2" prop="place">
134 134 <el-select v-model="bindname" filterable reserve-keyword @change="getEarthsiteId">
135 135 <el-option v-if="item.show"
... ... @@ -140,9 +140,9 @@
140 140 </el-option>
141 141 </el-select>
142 142 </el-form-item>
143   - </el-col>
  143 + </el-col> -->
144 144 </el-row>
145   - <el-row type="flex" justify="center" v-if="form.type != null">
  145 + <!-- <el-row type="flex" justify="center" v-if="form.type != null">
146 146 <el-col>
147 147 <el-form-item label="消纳合同" prop="contract">
148 148 <el-select v-model="form.contract" filterable reserve-keyword @change="conractCheck">
... ... @@ -151,7 +151,7 @@
151 151 </el-select>
152 152 </el-form-item>
153 153 </el-col>
154   - </el-row>
  154 + </el-row> -->
155 155 <el-row type="flex" justify="center" v-if="form.type == 0" >
156 156 <el-col :span="12" >
157 157 <el-form-item label="运输企业" prop="companys">
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @04f65ed
... ... @@ -263,120 +263,37 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
263 263 List<Map<String,String>> list = new ArrayList<Map<String,String>>();
264 264  
265 265 for(SupervisionThreestep s:constructions){
266   - Map<String,String> map = new HashMap<String, String>();
267   - map.put("id", s.getId() + "");
268   - map.put("createTime", yearFomat.format(s.getCreateTime()));
269   - map.put("name", s.getName());
270   - map.put("place", s.getPlace());
271   - map.put("status", s.getStatus() == 1 ? "开工" : "未开工");
272   - map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
273   - map.put("objectId", s.getObjectId());
274   - map.put("type", "");
275 266  
276 267 for(SupervisionThreestep e:earthsites){
277 268  
278   - if(s.getEarthsitesId() == null || e.getEarthsitesId() == null){
279   - continue;
280   - }
281   -
282   - if(s.getEarthsitesId().equals(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))
283   - && e.getEarthsitesId().equals(s.getObjectId())){
  269 + if(s.getEarthsitesId().contains(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))){
284 270  
285   - if(s.getStatus() != 1 && e.getStatus() != 1){
  271 + if(s.getStatus() != 1 || e.getStatus() != 1){
286 272 continue;
287 273 }
288 274  
  275 + Map<String,String> map = new HashMap<String, String>();
  276 + map.put("id", s.getId() + "");
  277 + map.put("createTime", yearFomat.format(s.getCreateTime()));
  278 + map.put("name", s.getName());
  279 + map.put("place", s.getPlace());
  280 + map.put("status", "开工");
  281 + map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
  282 + map.put("objectId", s.getObjectId());
  283 + map.put("type", "");
289 284 map.put("eid", e.getObjectId());
290 285 map.put("ename", e.getName());
291 286 map.put("eplace", e.getPlace());
292   - map.put("estatus", e.getStatus() == 1 ? "开工" : "未开工");
  287 + map.put("estatus", "开工" );
293 288 map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
294 289 map.put("etype", "");
295 290  
296   - if(s.getStatus() == 1 && e.getStatus() == 1){
297   - map.put("descript", "有效开工");
298   - }else{
299   - String string = s.getStatus() != 1 ? "工地未开工" : "";
300   - string += e.getStatus() != 1 ? "处理场所未开工" : "";
301   - map.put("descript", string );
302   - }
303   - }
304   - }
305   -
306   - if(map.get("ename") == null){
307   - if(s.getStatus() != 1){
308   - continue;
309   - }
310   -
311   - Map map2 = new HashedMap<>();
312   - List ids = new ArrayList<>();
313   - ids.add(s.getEarthsitesId());
314   -
315   - map2.put("ids", ids);
316   - map2.put("size", 1);
317   - map2.put("page", 1);
318   -
319   - JSONObject earthList = RemoteServerUtils.getEarthSitesInfo( s.getEarthsitesId());
320   -
321   - if(earthList != null && earthList.size() > 0){
322   - map.put("eplace",((JSONObject)earthList).getString("areaName"));
323   - }
324   -
325   - map.put("eid", s.getEarthsitesId());
326   - map.put("ename", s.getEarthsitesName());
327   - map.put("estatus", "未开工");
328   - map.put("descript", "处理场所未开工");
329   - map.put("etype", "");
330   -
331   - }
332   - list.add(map);
333   - }
334   -
335   -
336   - List newList = new ArrayList<>();
337   -
338   - for(SupervisionThreestep e:earthsites){
339   - if(e.getStatus() != 1){
340   - continue;
341   - }
342   -
343   - Map map = new HashMap();
344   - boolean needAdd = true;
345   - for(Map<String,String> m:list){
346   - if(e.getEarthsitesId().equals(m.get("objectId")) && e.getObjectId().equals(m.get("eid")) && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
347   - needAdd = false;
348   - break;
  291 + map.put("descript", "有效开工");
  292 +
  293 + list.add(map);
349 294 }
350 295 }
351   -
352   - if(!needAdd)
353   - continue;
354   -
355   - JSONObject con = RemoteServerUtils.getConstructionInfo(e.getEarthsitesId());
356   -
357   -
358   - map.put("id", e.getId() + "");
359   - map.put("createTime", yearFomat.format(e.getCreateTime()));
360   - map.put("name", e.getEarthsitesName());
361   - map.put("place", con.getString("areaCode"));
362   - map.put("status", "未开工");
363   - map.put("objectId", e.getEarthsitesId());
364   - map.put("eid", e.getObjectId());
365   - map.put("etype", "");
366   - map.put("type", "");
367   - map.put("ename", e.getName());
368   - map.put("eplace", e.getPlace());
369   - map.put("estatus", "开工");
370   - map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
371   - map.put("descript", "工地未开工");
372   -
373   - newList.add(map);
374 296 }
375   -
376   - if(newList.size() >0){
377   - list.addAll(newList);
378   - }
379   -
380 297  
381 298  
382 299 List FilterList = new ArrayList<>();
... ... @@ -773,7 +690,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
773 690  
774 691 for(String truck: truckArray){
775 692  
776   -
777 693 if(truckObject.getString("vehicleId").equals(truck)){
778 694 TruckActivate truckActivate = new TruckActivate();
779 695  
... ...