youxiw2000 / trash · Commits

Commit e0938c1f01f37f135ad9cd1e354f5a9e04b3f48a

Authored by youxiw2000
1 parent dc74ac70
build: skipped

m

Inline Side-by-side
Showing 8 changed files with 102 additions and 76 deletions
trash-ui/src/views/activiti/task/earthsitesInfo.vue
  View file @e0938c1
1 1 <template>
2 2 <div v-loading="loading" style="border:1px solid black;">
3 3 <el-row class="bd_bottom" >
4   - <el-col :span="6" class="bd_right bd_padding">消纳场编号</el-col>
5   - <el-col :span="6" class="bd_padding">{{infoData.number}}</el-col>
6   - <el-col :span="6" class="bd_left bd_right bd_padding">设计消纳场容量(m³)</el-col>
7   - <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
  4 + <el-col :span="6" class="bd_right bd_padding">消纳场名称</el-col>
  5 + <el-col :span="6" class="bd_padding">{{infoData.name}}</el-col>
  6 + <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
  7 + <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
8 8 </el-row>
9 9 <el-row class="bd_bottom" >
10 10 <el-col :span="6" class="bd_right bd_padding">消纳场类型</el-col>
11 11 <el-col :span="6" class="bd_padding">{{infoData.typeName}}</el-col>
12   - <el-col :span="6" class="bd_left bd_right bd_padding">区属</el-col>
  12 + <el-col :span="6" class="bd_left bd_right bd_padding">所在区域</el-col>
13 13 <el-col :span="6" class="bd_padding">{{infoData.areaName}}</el-col>
14 14 </el-row>
15   -
16   -
17 15 <el-row class="bd_bottom" >
18   - <el-col :span="6" class="bd_right bd_padding">消纳场面积(㎡)</el-col>
19   - <el-col :span="6" class="bd_padding">{{infoData.area}}</el-col>
20   - <el-col :span="6" class="bd_left bd_right bd_padding">日处理能力(m³)</el-col>
21   - <el-col :span="6" class="bd_padding">{{infoData.dayAbility}}</el-col>
  16 + <el-col :span="6" class="bd_right bd_padding">所在地址</el-col>
  17 + <el-col :span="6" class="bd_padding">{{infoData.address}}</el-col>
  18 + <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
  19 + <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
22 20 </el-row>
  21 +
23 22 <el-row class="bd_bottom">
24   - <el-col :span="6" class="bd_right bd_padding">处置类型</el-col>
25   - <el-col :span="6" class="bd_padding">{{infoData.disposalType}}</el-col>
  23 + <el-col :span="6" class="bd_right bd_padding">备案方量(m³)</el-col>
  24 + <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
26 25 <el-col :span="6" class="bd_left bd_right bd_padding">建筑垃圾类型</el-col>
27 26 <el-col :span="6" class="bd_padding">{{infoData.buildWasteTypeName}}</el-col>
28 27 </el-row>
29 28 <el-row class="bd_bottom" >
30   - <el-col :span="6" class="bd_right bd_padding">卸土费金额</el-col>
31   - <el-col :span="6" class="bd_padding">{{infoData.unloadingPrice}}</el-col>
32   - <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
33   - <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
34   - </el-row>
35   - <el-row class="bd_bottom" >
36   - <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
37   - <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
38   - <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
39   - <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
  29 + <el-col :span="6" class="bd_right bd_padding">建筑单位责任人</el-col>
  30 + <el-col :span="6" class="bd_padding">{{infoData.principal}}</el-col>
  31 + <el-col :span="6" class="bd_left bd_right bd_padding">责任人联系电话</el-col>
  32 + <el-col :span="6" class="bd_padding">{{infoData.principalPhoneNo}}</el-col>
40 33 </el-row>
41 34 <el-row class="bd_bottom">
42   - <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
43   - <el-col :span="6" class="bd_padding">{{infoData.routeName}}</el-col>
44   - <el-col :span="6" class="bd_left bd_right bd_padding">线路宽度</el-col>
45   - <el-col :span="6" class="bd_padding">{{infoData.routeWidth}}</el-col>
  35 + <el-col :span="6" class="bd_right bd_padding">有效期开始时间</el-col>
  36 + <el-col :span="6" class="bd_padding">{{infoData.effectiveFrom}}</el-col>
  37 + <el-col :span="6" class="bd_left bd_right bd_padding">有效期结束时间</el-col>
  38 + <el-col :span="6" class="bd_padding">{{infoData.effectiveEnd}}</el-col>
46 39 </el-row>
47 40 <el-row class="bd_bottom">
48 41 <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
... ... @@ -80,10 +73,14 @@
80 73 <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
81 74 <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
82 75 </el-row>
83   - <el-row >
  76 + <el-row class="bd_bottom">
84 77 <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
85 78 <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
86 79 </el-row>
  80 + <el-row >
  81 + <el-col :span="6" class="bd_right bd_padding">电子围栏</el-col>
  82 + <el-col :span="18" class="bd_padding">{{infoData.polygonId}}</el-col>
  83 + </el-row>
87 84 </div>
88 85 </template>
89 86  
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @e0938c1
1 1 <template>
2 2 <div class="app-container">
3   - <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
  3 + <!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
4 4 <el-option v-for="item in depts" :label="item.name"
5 5 :value="item.code" :key="item.code">
6 6 </el-option>
... ... @@ -9,7 +9,7 @@
9 9 <el-option v-for="item in roles" :label="item.name"
10 10 :value="item.code" :key="item.code">
11 11 </el-option>
12   - </el-select>
  12 + </el-select> -->
13 13  
14 14  
15 15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
... ...
trash-ui/src/views/activiti/task/taskCard.vue
  View file @e0938c1
... ... @@ -47,17 +47,9 @@
47 47  
48 48 data() {
49 49 return {
50   -
51   - threestep_type:{
52   - "0":"工地",
53   - "1":"消纳场",
54   - },
55 50 }
56 51 },
57 52 created() {
58   - if (this.task.definitionKey == "workflow_threestep") {
59   - this.task.type = this.threestep_type[this.task.type + ""];
60   - }
61 53 },
62 54 methods: {
63 55 sendToParent(task) {
... ...
trash-ui/src/views/h5/task/earthsitesInfo.vue
  View file @e0938c1
1 1 <template>
2 2 <div v-loading="loading" style="border:1px solid black;">
3 3 <el-row class="bd_bottom" >
4   - <el-col :span="6" class="bd_right bd_padding">消纳场编号</el-col>
5   - <el-col :span="6" class="bd_padding">{{infoData.number}}</el-col>
6   - <el-col :span="6" class="bd_left bd_right bd_padding">设计消纳场容量(m³)</el-col>
7   - <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
  4 + <el-col :span="6" class="bd_right bd_padding">消纳场名称</el-col>
  5 + <el-col :span="6" class="bd_padding">{{infoData.name}}</el-col>
  6 + <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
  7 + <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
8 8 </el-row>
9 9 <el-row class="bd_bottom" >
10 10 <el-col :span="6" class="bd_right bd_padding">消纳场类型</el-col>
11 11 <el-col :span="6" class="bd_padding">{{infoData.typeName}}</el-col>
12   - <el-col :span="6" class="bd_left bd_right bd_padding">区属</el-col>
  12 + <el-col :span="6" class="bd_left bd_right bd_padding">所在区域</el-col>
13 13 <el-col :span="6" class="bd_padding">{{infoData.areaName}}</el-col>
14 14 </el-row>
15   -
16   -
17 15 <el-row class="bd_bottom" >
18   - <el-col :span="6" class="bd_right bd_padding">消纳场面积(㎡)</el-col>
19   - <el-col :span="6" class="bd_padding">{{infoData.area}}</el-col>
20   - <el-col :span="6" class="bd_left bd_right bd_padding">日处理能力(m³)</el-col>
21   - <el-col :span="6" class="bd_padding">{{infoData.dayAbility}}</el-col>
  16 + <el-col :span="6" class="bd_right bd_padding">所在地址</el-col>
  17 + <el-col :span="6" class="bd_padding">{{infoData.address}}</el-col>
  18 + <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
  19 + <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
22 20 </el-row>
  21 +
23 22 <el-row class="bd_bottom">
24   - <el-col :span="6" class="bd_right bd_padding">处置类型</el-col>
25   - <el-col :span="6" class="bd_padding">{{infoData.disposalType}}</el-col>
  23 + <el-col :span="6" class="bd_right bd_padding">备案方量(m³)</el-col>
  24 + <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
26 25 <el-col :span="6" class="bd_left bd_right bd_padding">建筑垃圾类型</el-col>
27 26 <el-col :span="6" class="bd_padding">{{infoData.buildWasteTypeName}}</el-col>
28 27 </el-row>
29 28 <el-row class="bd_bottom" >
30   - <el-col :span="6" class="bd_right bd_padding">卸土费金额</el-col>
31   - <el-col :span="6" class="bd_padding">{{infoData.unloadingPrice}}</el-col>
32   - <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
33   - <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
34   - </el-row>
35   - <el-row class="bd_bottom" >
36   - <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
37   - <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
38   - <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
39   - <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
  29 + <el-col :span="6" class="bd_right bd_padding">建筑单位责任人</el-col>
  30 + <el-col :span="6" class="bd_padding">{{infoData.principal}}</el-col>
  31 + <el-col :span="6" class="bd_left bd_right bd_padding">责任人联系电话</el-col>
  32 + <el-col :span="6" class="bd_padding">{{infoData.principalPhoneNo}}</el-col>
40 33 </el-row>
41 34 <el-row class="bd_bottom">
42   - <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
43   - <el-col :span="6" class="bd_padding">{{infoData.routeName}}</el-col>
44   - <el-col :span="6" class="bd_left bd_right bd_padding">线路宽度</el-col>
45   - <el-col :span="6" class="bd_padding">{{infoData.routeWidth}}</el-col>
  35 + <el-col :span="6" class="bd_right bd_padding">有效期开始时间</el-col>
  36 + <el-col :span="6" class="bd_padding">{{infoData.effectiveFrom}}</el-col>
  37 + <el-col :span="6" class="bd_left bd_right bd_padding">有效期结束时间</el-col>
  38 + <el-col :span="6" class="bd_padding">{{infoData.effectiveEnd}}</el-col>
46 39 </el-row>
47 40 <el-row class="bd_bottom">
48 41 <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
... ... @@ -80,10 +73,14 @@
80 73 <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
81 74 <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
82 75 </el-row>
83   - <el-row >
  76 + <el-row class="bd_bottom">
84 77 <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
85 78 <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
86 79 </el-row>
  80 + <el-row >
  81 + <el-col :span="6" class="bd_right bd_padding">电子围栏</el-col>
  82 + <el-col :span="18" class="bd_padding">{{infoData.polygonId}}</el-col>
  83 + </el-row>
87 84 </div>
88 85 </template>
89 86  
... ...
trash-ui/src/views/h5/task/index.vue
  View file @e0938c1
1 1 <template>
2 2 <div class="app-container">
3   - <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
  3 + <!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
4 4 <el-option v-for="item in depts" :label="item.name"
5 5 :value="item.code" :key="item.code" >
6 6 </el-option>
... ... @@ -9,7 +9,7 @@
9 9 <el-option v-for="item in roles" :label="item.name"
10 10 :value="item.code" :key="item.code" >
11 11 </el-option>
12   - </el-select>
  12 + </el-select> -->
13 13  
14 14  
15 15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
... ...
trash-ui/src/views/h5/task/taskCard.vue
  View file @e0938c1
... ... @@ -38,17 +38,10 @@
38 38 data() {
39 39 return {
40 40  
41   - threestep_type:{
42   - "0":"工地",
43   - "1":"消纳场",
44   - },
45 41 }
46 42 },
47 43 created() {
48 44  
49   - if (this.task.definitionKey == "workflow_threestep") {
50   - this.task.type = this.threestep_type[this.task.type];
51   - }
52 45 },
53 46 methods: {
54 47 sendToParent(task) {
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @e0938c1
... ... @@ -3,6 +3,7 @@ package com.trash.business.controller;
3 3 import java.io.IOException;
4 4 import java.util.ArrayList;
5 5 import java.util.Date;
  6 +import java.util.HashMap;
6 7 import java.util.List;
7 8 import java.util.Map;
8 9  
... ... @@ -65,6 +66,48 @@ public class SupervisionThreestepController extends BaseController
65 66 startPage();
66 67 if(supervisionThreestep.getStatus() == null)
67 68 supervisionThreestep.setCreateBy(SecurityUtils.getUsername());
  69 +
  70 + Map<String, String> map = new HashMap<String, String>();
  71 + map.put("type", "CSUserDepartmentType");
  72 + JSONArray depts = RemoteServerUtils.getDict(map);
  73 + JSONArray areas = RemoteServerUtils.getAreas();
  74 +
  75 +
  76 +
  77 + for(Object object :depts){
  78 + JSONObject dept = (JSONObject) object;
  79 + List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
  80 +
  81 + for(String role:roles){
  82 + if(dept.getString("code").equals(role)){
  83 + if(dept.getString("name").contains("渣土办")){
  84 +
  85 + if(dept.getString("name").equals("治理部")){
  86 + supervisionThreestep.setCreateBy(null);
  87 + break;
  88 + }
  89 +
  90 + String deptName = dept.getString("name").replace("渣土办", "");
  91 +
  92 + if(!deptName.isEmpty()){
  93 +
  94 + for(Object obj:areas){
  95 + JSONObject area = (JSONObject)obj;
  96 +
  97 + if(area.getString("name").equals(deptName)){
  98 +
  99 + supervisionThreestep.setPlace(area.getString("code"));
  100 + }
  101 + }
  102 + }
  103 +
  104 + }
  105 + }
  106 + }
  107 +
  108 + }
  109 +
  110 +
68 111 List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
69 112 return getDataTable(list);
70 113 }
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @e0938c1
... ... @@ -10,6 +10,7 @@ import java.util.stream.Collectors;
10 10 import com.trash.casefile.domain.ViolationWarningInformation;
11 11 import com.trash.common.config.trashConfig;
12 12 import com.trash.common.core.redis.RedisCache;
  13 +import com.trash.common.core.domain.entity.SysUser;
13 14 import com.trash.common.core.domain.model.LoginUser;
14 15 import com.trash.framework.web.service.SysLoginService;
15 16 import org.activiti.api.process.model.ProcessInstance;
... ... @@ -130,7 +131,10 @@ public class WorkflowServiceImpl implements IWorkflowService {
130 131 ConstructionSign constructionSign = new ConstructionSign();
131 132  
132 133 constructionSign.setObjectId(map.get("id").toString());
133   - if(!SecurityUtils.getLoginUser().getUser().getAvatar().contains("null")){
  134 +
  135 + SysUser user = SecurityUtils.getLoginUser().getUser();
  136 +
  137 + if(!user.getAvatar().contains("null")){
134 138 constructionSign.setSign1(SecurityUtils.getLoginUser().getUser().getAvatar());
135 139 constructionSign.setSign1Time(new Date());
136 140 }
... ...