m

youxiw2000
1 parent d9493d3f
Showing 5 changed files with 46 additions and 9 deletions
trash-ui/src/views/activiti/task/constructsiteInfo.vue
trash-ui/src/views/activiti/task/earthsitesInfo.vue
trash-ui/src/views/h5/task/earthsitesInfo.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -139,6 +139,9 @@
             <el-row class="bd_padding">
               <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
             </el-row>
+            <el-row >
+              <label style="float: right;" v-if="signData && signData.sign1">签字:<img :src="signData.sign1" width="100px" height="40px" />{{signData.sign1Time}}</label>
+            </el-row>
         </el-col>
       </el-col>
     </el-row>
@@ -148,7 +151,7 @@
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign2Text}}</el-row>
           <el-row >
-            <label style="float: right;">签字:<img :src="signData.sign2" width="100px" height="40px" v-if="signData && signData.sign2"/>{{signData.sign2Time}}</label>
+            <label style="float: right;" v-if="signData && signData.sign2">签字:<img :src="signData.sign2" width="100px" height="40px" />{{signData.sign2Time}}</label>
           </el-row>
       </el-col>
     </el-row>
@@ -158,7 +161,7 @@
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
           <el-row class="bd_padding">
-            <label style="float: right;">签字:<img :src="signData.sign3" width="100px" height="40px"  v-if="signData && signData.sign3"/>{{signData.sign3Time}}</label>
+            <label style="float: right;"  v-if="signData && signData.sign3">签字:<img :src="signData.sign3" width="100px" height="40px" />{{signData.sign3Time}}</label>
           </el-row>
       </el-col>
     </el-row>
@@ -168,7 +171,7 @@
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
           <el-row class="bd_padding">
-            <label style="float: right;">签字:<img :src="signData.sign4" width="100px" height="40px"  v-if="signData && signData.sign4"/>{{signData.sign4Time}}</label>
+            <label style="float: right;"  v-if="signData && signData.sign4">签字:<img :src="signData.sign4" width="100px" height="40px" />{{signData.sign4Time}}</label>
           </el-row>
       </el-col>
     </el-row>
@@ -36,7 +36,7 @@
           <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
           <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
           <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
-          <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
         </el-row>
         <el-row class="bd_bottom">
           <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
@@ -78,7 +78,7 @@
           <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
           <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
           <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
-          <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
         </el-row>
         <el-row >
           <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
@@ -36,7 +36,7 @@
           <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
           <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
           <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
-          <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.workAreaCodeName}}</el-col>
         </el-row>
         <el-row class="bd_bottom">
           <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
@@ -78,7 +78,7 @@
           <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
           <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
           <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
-          <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.filledBy}}</el-col>
         </el-row>
         <el-row >
           <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
@@ -184,7 +184,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
-
 		if (supervisionThreestep.getWorkStartTime() == null) {
 			String start, end;
@@ -229,9 +228,25 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		List<SupervisionThreestep> constructions = new ArrayList<>();
 		List<SupervisionThreestep> earthsites = new ArrayList<>();
+		JSONArray areas = RemoteServerUtils.getAreas();
 		for(SupervisionThreestep s: allList){
+			
+			if (s.getType() == 1) {
+				for(Object object:areas){
+					
+					JSONObject area = (JSONObject)object;
+						
+					if(s.getPlace().equals(area.getString("code"))){
+						s.setPlace(area.getString("name"));
+					}
+			}
+			
+				
+		}
+			
+			
 			if(supervisionThreestep.getHis().equals("1")){
 				if(yearFomat.format(s.getSelfCheckTime()).equals(yearFomat.format(new Date()))){
 					continue;
 package com.trash.workflow.service.impl;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -34,7 +35,9 @@ import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.trash.business.domain.ConstructionSign;
 import com.trash.business.domain.SupervisionThreestep;
+import com.trash.business.service.IConstructionSignService;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
@@ -68,6 +71,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
     @Autowired
     private TaskRuntime taskRuntime;
+    
+    @Autowired
+    IConstructionSignService signService;
     @Autowired
@@ -118,6 +124,20 @@ public class WorkflowServiceImpl implements IWorkflowService {
             if (flowType.equals("workflow_earthsites")) {
             	PorcThreeStepTask(processInstance, areaCode);
             }
+            
+            if(flowType.equals("workflow_constructsite")){
+            	
+            	ConstructionSign constructionSign = new ConstructionSign();
+            	
+            	constructionSign.setObjectId(map.get("id").toString());
+            	if(!SecurityUtils.getLoginUser().getUser().getAvatar().contains("null")){
+            		constructionSign.setSign1(SecurityUtils.getLoginUser().getUser().getAvatar());
+            		constructionSign.setSign1Time(new Date());
+            	}
+            	
+            	signService.insertConstructionSign(constructionSign);
+            	
+            }
             Workflow workflow = new Workflow();
             workflow.setId(businessKey);
@@ -201,7 +221,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
             PorcThreeStepTask(processInstance, supervision.getPlace());
-
             Workflow workflow = new Workflow();
             workflow.setId("workflow_threestep:" + supervision.getId());
             workflow.setTitle("报工自查-合同编号:" + supervision.getContract());