youxiw2000 / trash · Commits

Commit a3187b66aad35f935f2c68cc2c2b6fb87a4f1416

Authored by youxiw2000
1 parent d9493d3f

m

Inline Side-by-side
Showing 5 changed files with 46 additions and 9 deletions
trash-ui/src/views/activiti/task/constructsiteInfo.vue
  View file @a3187b6
... ... @@ -139,6 +139,9 @@
139 139 <el-row class="bd_padding">
140 140 <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
141 141 </el-row>
  142 + <el-row >
  143 + <label style="float: right;" v-if="signData && signData.sign1">签字:<img :src="signData.sign1" width="100px" height="40px" />{{signData.sign1Time}}</label>
  144 + </el-row>
142 145 </el-col>
143 146 </el-col>
144 147 </el-row>
... ... @@ -148,7 +151,7 @@
148 151 <el-col :span="23" >
149 152 <el-row class="bd_padding">{{signData.sign2Text}}</el-row>
150 153 <el-row >
151   - <label style="float: right;">签字:<img :src="signData.sign2" width="100px" height="40px" v-if="signData && signData.sign2"/>{{signData.sign2Time}}</label>
  154 + <label style="float: right;" v-if="signData && signData.sign2">签字:<img :src="signData.sign2" width="100px" height="40px" />{{signData.sign2Time}}</label>
152 155 </el-row>
153 156 </el-col>
154 157 </el-row>
... ... @@ -158,7 +161,7 @@
158 161 <el-col :span="23" >
159 162 <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
160 163 <el-row class="bd_padding">
161   - <label style="float: right;">签字:<img :src="signData.sign3" width="100px" height="40px" v-if="signData && signData.sign3"/>{{signData.sign3Time}}</label>
  164 + <label style="float: right;" v-if="signData && signData.sign3">签字:<img :src="signData.sign3" width="100px" height="40px" />{{signData.sign3Time}}</label>
162 165 </el-row>
163 166 </el-col>
164 167 </el-row>
... ... @@ -168,7 +171,7 @@
168 171 <el-col :span="23" >
169 172 <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
170 173 <el-row class="bd_padding">
171   - <label style="float: right;">签字:<img :src="signData.sign4" width="100px" height="40px" v-if="signData && signData.sign4"/>{{signData.sign4Time}}</label>
  174 + <label style="float: right;" v-if="signData && signData.sign4">签字:<img :src="signData.sign4" width="100px" height="40px" />{{signData.sign4Time}}</label>
172 175 </el-row>
173 176 </el-col>
174 177 </el-row>
... ...
trash-ui/src/views/activiti/task/earthsitesInfo.vue
  View file @a3187b6
... ... @@ -36,7 +36,7 @@
36 36 <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
37 37 <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
38 38 <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
39   - <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
  39 + <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
40 40 </el-row>
41 41 <el-row class="bd_bottom">
42 42 <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
... ... @@ -78,7 +78,7 @@
78 78 <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
79 79 <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
80 80 <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
81   - <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
  81 + <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
82 82 </el-row>
83 83 <el-row >
84 84 <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
... ...
trash-ui/src/views/h5/task/earthsitesInfo.vue
  View file @a3187b6
... ... @@ -36,7 +36,7 @@
36 36 <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
37 37 <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
38 38 <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
39   - <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
  39 + <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
40 40 </el-row>
41 41 <el-row class="bd_bottom">
42 42 <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
... ... @@ -78,7 +78,7 @@
78 78 <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
79 79 <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
80 80 <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
81   - <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
  81 + <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
82 82 </el-row>
83 83 <el-row >
84 84 <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @a3187b6
... ... @@ -184,7 +184,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
184 184 @SuppressWarnings("unchecked")
185 185 @Override
186 186 public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
187   -
188 187 if (supervisionThreestep.getWorkStartTime() == null) {
189 188 String start, end;
190 189  
... ... @@ -229,9 +228,25 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
229 228  
230 229 List<SupervisionThreestep> constructions = new ArrayList<>();
231 230 List<SupervisionThreestep> earthsites = new ArrayList<>();
  231 + JSONArray areas = RemoteServerUtils.getAreas();
232 232  
233 233 for(SupervisionThreestep s: allList){
234 234  
  235 +
  236 + if (s.getType() == 1) {
  237 + for(Object object:areas){
  238 +
  239 + JSONObject area = (JSONObject)object;
  240 +
  241 + if(s.getPlace().equals(area.getString("code"))){
  242 + s.setPlace(area.getString("name"));
  243 + }
  244 + }
  245 +
  246 +
  247 + }
  248 +
  249 +
235 250 if(supervisionThreestep.getHis().equals("1")){
236 251 if(yearFomat.format(s.getSelfCheckTime()).equals(yearFomat.format(new Date()))){
237 252 continue;
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @a3187b6
1 1 package com.trash.workflow.service.impl;
2 2  
3 3 import java.text.SimpleDateFormat;
  4 +import java.util.Date;
4 5 import java.util.List;
5 6 import java.util.Map;
6 7 import java.util.concurrent.TimeUnit;
... ... @@ -34,7 +35,9 @@ import org.springframework.transaction.annotation.Transactional;
34 35  
35 36 import com.alibaba.fastjson.JSONArray;
36 37 import com.alibaba.fastjson.JSONObject;
  38 +import com.trash.business.domain.ConstructionSign;
37 39 import com.trash.business.domain.SupervisionThreestep;
  40 +import com.trash.business.service.IConstructionSignService;
38 41 import com.trash.business.service.ISupervisionThreestepService;
39 42 import com.trash.caseOffline.domain.CaseOffline;
40 43 import com.trash.casefile.domain.ViolationCaseFile;
... ... @@ -68,6 +71,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
68 71  
69 72 @Autowired
70 73 private TaskRuntime taskRuntime;
  74 +
  75 + @Autowired
  76 + IConstructionSignService signService;
71 77  
72 78  
73 79 @Autowired
... ... @@ -118,6 +124,20 @@ public class WorkflowServiceImpl implements IWorkflowService {
118 124 if (flowType.equals("workflow_earthsites")) {
119 125 PorcThreeStepTask(processInstance, areaCode);
120 126 }
  127 +
  128 + if(flowType.equals("workflow_constructsite")){
  129 +
  130 + ConstructionSign constructionSign = new ConstructionSign();
  131 +
  132 + constructionSign.setObjectId(map.get("id").toString());
  133 + if(!SecurityUtils.getLoginUser().getUser().getAvatar().contains("null")){
  134 + constructionSign.setSign1(SecurityUtils.getLoginUser().getUser().getAvatar());
  135 + constructionSign.setSign1Time(new Date());
  136 + }
  137 +
  138 + signService.insertConstructionSign(constructionSign);
  139 +
  140 + }
121 141  
122 142 Workflow workflow = new Workflow();
123 143 workflow.setId(businessKey);
... ... @@ -201,7 +221,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
201 221  
202 222 PorcThreeStepTask(processInstance, supervision.getPlace());
203 223  
204   -
205 224 Workflow workflow = new Workflow();
206 225 workflow.setId("workflow_threestep:" + supervision.getId());
207 226 workflow.setTitle("报工自查-合同编号:" + supervision.getContract());
... ...