m

youxiw2000
1 parent 7d80695e
Showing 12 changed files with 114 additions and 34 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-ui/src/api/three_step.js
trash-ui/src/layout/index1.vue → trash-ui/src/layout/index3.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/h5/task/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
trash-workFlow/src/main/java/com/trash/business/mapper/TruckActivateMapper.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/listener/SupervisionStateListener.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -32,8 +32,32 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
  
     @Override
     public List<ActWorkflowFormData> historyDataShow(String businessKey) {
-        List<HistoryDataDTO> returnHistoryFromDataDTOS=new ArrayList<>();
+        List<ActWorkflowFormData> returnHistoryFromDataDTOS=new ArrayList<>();
+        
+        
         List<ActWorkflowFormData> actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
+        
+        for(int i =0;i<actWorkflowFormData.size();i++){
+        	if(i == actWorkflowFormData.size()-1){
+        		returnHistoryFromDataDTOS.add(actWorkflowFormData.get(i));
+        		continue;
+        	}
+        	
+        	ActWorkflowFormData one = actWorkflowFormData.get(i);
+        	ActWorkflowFormData two = actWorkflowFormData.get(i+1);
+        	
+        	if(one.getCreateBy().equals(two.getCreateBy()) && one.getCreateTime().getTime() == two.getCreateTime().getTime()){
+        		
+        		one.setControlValue(one.getControlValue() + " " + two.getControlValue());
+        		
+        		returnHistoryFromDataDTOS.add(one);
+        		i+=1;
+        		continue;
+        	}
+
+    		returnHistoryFromDataDTOS.add(one);
+        }
+        
 //        Map<String, List<ActWorkflowFormData>> collect = actWorkflowFormData.stream().collect(Collectors.groupingBy(ActWorkflowFormData::getTaskNodeName));
 //        collect.entrySet().forEach(
 //                entry -> {
@@ -47,7 +71,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
 //        );
 //        List<HistoryDataDTO> collect1 = returnHistoryFromDataDTOS.stream().sorted((x, y) -> x.getCreatedDate().compareTo(y.getCreatedDate())).collect(Collectors.toList());
  
-        return actWorkflowFormData;
+        return returnHistoryFromDataDTOS;
     }
  
  
@@ -618,12 +618,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
  
-          if(this.form.type == 0){
             let racts = [];
             let ractsName = [];
             let earthIds = [];
             let earthNames = [];
  
+          if(this.form.type == 0){
+
             for(let i in this.contractList){
               if(this.contractList[i].constructionSiteID == this.form.objectId){
                   racts.push(this.contractList[i].id);
@@ -638,18 +639,21 @@ export default {
             this.form.contract = ractsName + "";
             this.form.contractId = racts + "";
           }
-          // else{
-            // for(let i in this.contractList){
-            //   if(this.contractList[i].earthSiteID == this.form.objectId){
-            //       let item = this.contractList[i];
-            //     this.form.contract = item.contractNo;
-            //     this.form.contractId = item.id;
-            //     this.form.earthsitesId  = item.constructionSiteID;
-            //     this.form.earthsitesName = item.constructionSiteName;
-            //     break;
-            //   }
-            // }
-          // }
+          else{
+            for(let i in this.contractList){
+              if(this.contractList[i].earthSiteID == this.form.objectId){
+                  racts.push(this.contractList[i].id);
+                  ractsName.push(this.contractList[i].contractNo);
+                  earthIds.push(this.contractList[i].constructionSiteID);
+                  earthNames.push(this.contractList[i].constructionSiteName);
+              }
+            }
+
+            this.form.earthsitesId = earthIds + "";
+            this.form.earthsitesName = earthNames + "";
+            this.form.contract = ractsName + "";
+            this.form.contractId = racts + "";
+          }
  
           this.loading = true;
  
@@ -723,7 +723,8 @@ export default {
       names:null,
       hisfromData:[],
       slides:[],
-      slidesArys:[]
+      slidesArys:[],
+      prev:[]
     };
   },
   created() {
@@ -731,6 +732,16 @@ export default {
  
     getDict(dep).then(res => {
       this.depts = res.result;
+
+      // for(let i in depts){
+
+      //   if(depts[i].indexOf("渣土办") ==){
+
+      //   }
+
+      // }
+
+
     });
  
     let role = {type: "CSUserPostType"};
@@ -989,7 +1000,7 @@ export default {
           }
         }
  
-        if (this.form.status == 1 && this.taskName == "巡查") {
+        if (this.form.status == 1) {
           activeThreestep(this.form).then(res => {
             formDataSave(this.id, this.form.formData).then(response => {
               this.msgSuccess("审批成功");
@@ -768,7 +768,7 @@ export default {
           }
         }
  
-        if (this.form.status == 1 && this.taskName == "巡查") {
+        if (this.form.status == 1 ) {
           activeThreestep(this.form).then(res => {
             formDataSave(this.id, this.form.formData).then(response => {
               this.msgSuccess("审批成功");
@@ -141,6 +141,8 @@ public class TruckActivateController extends BaseController
     public AjaxResult getConractByObjectId(@PathVariable("id") String id)
     {
  
+    	
+    	
     	AjaxResult ajaxResult = AjaxResult.success();
  
     	ajaxResult.put("result", truckActivateService.getConractByObjectId(id));
 package com.trash.business.mapper;
  
 import java.util.List;
+import java.util.Map;
+
 import com.trash.business.domain.TruckActivate;
  
 /**
@@ -65,7 +67,7 @@ public interface TruckActivateMapper
  
 	public TruckActivate selectTodayTruckByObjId(String objId);
  
-	public String getConractByObjectId(TruckActivate turck);
+	public Map<String,String> getConractByObjectId(TruckActivate turck);
  
 	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
 }
@@ -4,6 +4,8 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 import com.trash.common.utils.DateUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService
      */
  
     SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+    SimpleDateFormat dateTimeFomat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
  
     @Override
     public List<TruckActivate> selectTruckActivateList(TruckActivate truckActivate)
@@ -246,6 +249,10 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 	public String getConractByObjectId(String id){
  
     	TruckActivate turck = new TruckActivate();
+		SupervisionThreestep threestep = new SupervisionThreestep();
+		
+		String conractIds = "";
+		
  
     	turck.setObjectId(id);
  
@@ -264,20 +271,55 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 				end = yearFomat.format(date);
 			}
  
-			end += " 4:00:00";
-			start += " 8:00:00";
+			end += " 04:00:00";
+			start += " 08:00:00";
  
 			try {
 				turck.setStartTime(start);
 				turck.setEndTime(end);
+				threestep.setWorkStartTime(dateTimeFomat.parse(start));
+				threestep.setWorkEndTime(dateTimeFomat.parse(end));
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
  
+		Map<String,String> m = truckActivateMapper.getConractByObjectId(turck);
+		
+		if(m == null || m.get("earthsites_id") == null || m.get("earthsites_id").isEmpty()){
+			return null;
+		}
+		
+		for(String str:m.get("earthsites_id").split(",")){
+			threestep.setObjectId(str);
+			threestep.setType(1L);
+			threestep.setStatus(1L);
+			List<SupervisionThreestep> list = threestepMapper.selectSupervisionThreestepList(threestep);
+			
+			
+			
+			if(list.size() == 1){
+				
+				String[] objs = list.get(0).getEarthsitesId().split(",");
+				
+				for(int j = 0 ; j<objs.length;j++){
+					SupervisionThreestep construction = new SupervisionThreestep();
+					construction.setWorkStartTime(threestep.getWorkStartTime());
+					construction.setWorkEndTime(threestep.getWorkEndTime());
+					construction.setObjectId(objs[j]);
+					construction.setType(0L);
+					construction.setStatus(1L);
+					if(threestepMapper.selectSupervisionThreestepList(construction).size() == 1){
+						conractIds += list.get(0).getContractId().split(",")[j] + ",";
+					}
+					
+				}
+			}
+		}
+		
  
-    	return truckActivateMapper.getConractByObjectId(turck);
+    	return conractIds.substring(0,conractIds.length()-1);
     }
  
 	@Override
@@ -29,9 +29,5 @@ public class SupervisionStateListener implements ExecutionListener {
  
        workflowUtils.sendDataToHisTory(delegateExecution, state);
  
-    	if("2".equals(state.getValue(delegateExecution))){
-        	SpringUtils.getBean(IActTaskService.class).deleteProcessById(delegateExecution.getProcessInstanceId());
-    	}
-    	
     }
 }
@@ -209,14 +209,14 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		ProcessInstance processInstance = null;
 		try {
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
-					.withProcessDefinitionKey("workflow_threestep").withName("报工自查:" + supervision.getContract())
+					.withProcessDefinitionKey("workflow_threestep").withName("报工自查:" + supervision.getName())
 					.withBusinessKey("workflow_threestep:" + supervision.getId()).build());
  
 			PorcThreeStepTask(processInstance, supervision.getPlace());
  
 			Workflow workflow = new Workflow();
 			workflow.setId("workflow_threestep:" + supervision.getId());
-			workflow.setTitle("报工自查-合同编号:" + supervision.getContract());
+			workflow.setTitle("报工自查:" + supervision.getName());
 			workflow.setReason("报工自查");
 			workflow.setStartTime(sdf.format(supervision.getSelfCheckTime()));
 			workflow.setEndTime(sdf.format(supervision.getSelfCheckTime()));
@@ -240,8 +240,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
 		ORDER BY self_check_time DESC
 	</select>
-	
-
  
  
 	<select id="selectSupervisionThreestepById" parameterType="Long"
@@ -399,6 +397,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		delete from supervision_threestep where id = #{id}
 	</delete>
  
+
 	<delete id="deleteSupervisionThreestepByIds" parameterType="String">
 		delete from supervision_threestep where id in
 		<foreach item="id" collection="array" open="(" separator=","
@@ -49,8 +49,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </where>
     </select>
  
-	<select id="getConractByObjectId" parameterType="TruckActivate" resultType="String">
-        select three.contract_id from(
+	<select id="getConractByObjectId" parameterType="TruckActivate" resultType="java.util.HashMap">
+        select three.* from(
 			select id, company, license_plate, time, construction, status, 
 			earthsite, object_id, create_by, create_type, activate_time, create_time 
 			from truck_activate
@@ -59,10 +59,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			activate_time between #{startTime} and #{endTime}) truck
 			LEFT JOIN (select * from supervision_threestep WHERE company_trucks LIKE CONCAT("%",#{objectId},"%")
 			and
-			check_time between #{startTime} and #{endTime}) three 
+			check_time between #{startTime} and #{endTime}
+			) three 
 			on 
 			truck.construction = three.name
-			and truck.earthsite = three.earthsites_name
     </select>
  
      <select id="selectTodayTruckByObjId" parameterType="String" resultMap="TruckActivateResult">