m

youxiw2000
1 parent 46daeb7c
Showing 13 changed files with 251 additions and 48 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/ProcessDefinitionController.java
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
trash-activiti/src/main/java/com/trash/activiti/service/IFormHistoryDataService.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-common/src/main/java/com/trash/common/core/page/TableDataInfo.java
trash-ui/src/api/dayWorkReport.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/activiti/task/taskCard.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
@@ -8,6 +8,7 @@ import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.core.page.TableSupport;
 import com.trash.common.enums.BusinessType;
 import com.trash.activiti.domain.dto.ProcessDefinitionDTO;
+import com.trash.activiti.mapper.ActReDeploymentMapper;
 import com.trash.activiti.service.IProcessDefinitionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 /**
@@ -32,6 +34,7 @@ public class ProcessDefinitionController extends BaseController {
     private IProcessDefinitionService processDefinitionService;
+
     /**
      * 获取流程定义集合
      *
@@ -41,8 +44,11 @@ public class ProcessDefinitionController extends BaseController {
     @GetMapping(value = "/list")
     public TableDataInfo list(ProcessDefinitionDTO processDefinition) {
         PageDomain pageDomain = TableSupport.buildPageRequest();
-        return getDataTable(processDefinitionService.selectProcessDefinitionList(processDefinition, pageDomain));
-
+        
+        TableDataInfo tableDataInfo = getDataTable(processDefinitionService.selectProcessDefinitionList(processDefinition, pageDomain));
+        
+        
+        return tableDataInfo;
     }
     /**
@@ -11,6 +11,7 @@ import com.trash.common.core.page.TableSupport;
 import com.trash.common.utils.ServletUtils;
 import com.trash.activiti.domain.dto.ActTaskDTO;
 import com.trash.activiti.domain.dto.ActWorkflowFormDataDTO;
+import com.trash.activiti.mapper.ActReDeploymentMapper;
 import com.trash.activiti.service.IActTaskService;
 import org.activiti.api.task.runtime.TaskRuntime;
@@ -30,12 +31,21 @@ public class TaskController extends BaseController {
     @Autowired
     private IActTaskService actTaskService;
+    @Autowired
+    private ActReDeploymentMapper actReDeploymentMapper;
+    
     //获取我的代办任务
     @GetMapping(value = "/list")
     public TableDataInfo getTasks() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectProcessDefinitionList(pageDomain);
-         return getDataTable(hashMaps);
+        
+        List<String> names =  actReDeploymentMapper.selectTitles();
+        
+        TableDataInfo tableDataInfo = getDataTable(hashMaps);
+        tableDataInfo.setNames(names);
+        
+        return tableDataInfo;
     }
     @RequestMapping("/taskHistory")
@@ -33,4 +33,7 @@ public interface ActReDeploymentMapper {
 		public Map<String, String> selectHistoryWorkByPId(String id);
+
+		public List<String> selectTitles();
+
 }
@@ -2,6 +2,7 @@ package com.trash.activiti.service;
 import java.util.List;
+import com.trash.activiti.domain.ActWorkflowFormData;
 import com.trash.activiti.domain.dto.HistoryDataDTO;
 /**
@@ -12,5 +13,5 @@ import com.trash.activiti.domain.dto.HistoryDataDTO;
  */
 public interface IFormHistoryDataService {
-    List<HistoryDataDTO> historyDataShow(String instanceId);
+	List<ActWorkflowFormData> historyDataShow(String instanceId);
 }
@@ -97,36 +97,55 @@ public class ActTaskServiceImpl implements IActTaskService {
 		 if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0  || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
 		 	 return list;
 		 }
+		 
+		String type = ServletUtils.getParameter("type");
+		String prev = ServletUtils.getParameter("prev");
+		String name = ServletUtils.getParameter("name");
+		
+		 
-		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime
-				.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
-
+		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
+		
 		List<Task> tasks = pageTasks.getContent();
 		int totalItems = pageTasks.getTotalItems();
 		list.setTotal(totalItems);
 		if (totalItems != 0) {
-			Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId())
-					.collect(Collectors.toSet());
+			Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
-			List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery()
-					.processInstanceIds(processInstanceIdIds).list();
+			List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();
+			
+			
 			Set<String> idString = new HashSet<String>();
 			for (ProcessInstance pi : processInstanceList) {
 				idString.add(pi.getBusinessKey());
 			}
 			List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);
+
+			List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t,
+							processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
+							maps.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get())).collect(Collectors.toList());
+			
+			
-			List<ActTaskDTO> actTaskDTOS = tasks.stream()
-					.map(t -> new ActTaskDTO(t,
-							processInstanceList.parallelStream()
-									.filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
-							maps.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.get("instance_id")))
-									.findAny().get()))
-					.collect(Collectors.toList());
-
-			list.addAll(actTaskDTOS);
+			
+			for(ActTaskDTO dto:actTaskDTOS){
+				if(name != null && !name.isEmpty() && !name.equals(dto.getInstanceName())){
+					continue;
+				}
+				if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
+					continue;
+				}
+				if(prev != null && !prev.isEmpty() && (dto.getPrev() == null || !dto.getPrev().contains(prev))){
+					continue;
+				}
+				
+
+				list.add(dto);
+			}
 		}
+		
+		list.setTotal(list.size());
 		return list;
 	}
@@ -31,23 +31,23 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     @Override
-    public List<HistoryDataDTO> historyDataShow(String businessKey) {
+    public List<ActWorkflowFormData> historyDataShow(String businessKey) {
         List<HistoryDataDTO> returnHistoryFromDataDTOS=new ArrayList<>();
         List<ActWorkflowFormData> actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
-        Map<String, List<ActWorkflowFormData>> collect = actWorkflowFormData.stream().collect(Collectors.groupingBy(ActWorkflowFormData::getTaskNodeName));
-        collect.entrySet().forEach(
-                entry -> {
-                    HistoryDataDTO returnHistoryFromDataDTO = new HistoryDataDTO();
-                    returnHistoryFromDataDTO.setTaskNodeName(entry.getValue().get(0).getTaskNodeName());
-                    returnHistoryFromDataDTO.setCreateName(entry.getValue().get(0).getCreateName());
-                    returnHistoryFromDataDTO.setCreatedDate(sdf.format(entry.getValue().get(0).getCreateTime()));
-                    returnHistoryFromDataDTO.setFormHistoryDataDTO(entry.getValue().stream().map(awfd->new HistoryFormDataDTO(awfd.getControlName(),awfd.getControlValue())).collect(Collectors.toList()));
-                    returnHistoryFromDataDTOS.add(returnHistoryFromDataDTO);
-                }
-        );
-        List<HistoryDataDTO> collect1 = returnHistoryFromDataDTOS.stream().sorted((x, y) -> x.getCreatedDate().compareTo(y.getCreatedDate())).collect(Collectors.toList());
-
-        return collect1;
+//        Map<String, List<ActWorkflowFormData>> collect = actWorkflowFormData.stream().collect(Collectors.groupingBy(ActWorkflowFormData::getTaskNodeName));
+//        collect.entrySet().forEach(
+//                entry -> {
+//                    HistoryDataDTO returnHistoryFromDataDTO = new HistoryDataDTO();
+//                    returnHistoryFromDataDTO.setTaskNodeName(entry.getValue().get(0).getTaskNodeName());
+//                    returnHistoryFromDataDTO.setCreateName(entry.getValue().get(0).getCreateName());
+//                    returnHistoryFromDataDTO.setCreatedDate(sdf.format(entry.getValue().get(0).getCreateTime()));
+//                    returnHistoryFromDataDTO.setFormHistoryDataDTO(entry.getValue().stream().map(awfd->new HistoryFormDataDTO(awfd.getControlName(),awfd.getControlValue())).collect(Collectors.toList()));
+//                    returnHistoryFromDataDTOS.add(returnHistoryFromDataDTO);
+//                }
+//        );
+//        List<HistoryDataDTO> collect1 = returnHistoryFromDataDTOS.stream().sorted((x, y) -> x.getCreatedDate().compareTo(y.getCreatedDate())).collect(Collectors.toList());
+
+        return actWorkflowFormData;
     }
@@ -38,6 +38,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
+	<select id="selectTitles"  parameterType="String" resultType="java.lang.String">
+			select DISTINCT title from workflow
+	</select>
+	
+	
+	
+	
 	<select id="selectUnCompleteWorkByUsername"  parameterType="String" resultType="java.lang.String">
 	   		select instance_id from workflow where id in (select business_key from act_workflow_formdata where create_by = #{username} GROUP BY business_key)
 	</select>
@@ -24,6 +24,11 @@ public class TableDataInfo implements Serializable
     /** 消息内容 */
     private String msg;
+    /** 列表数据 */
+    private List<String> names;
+    
+    /** 列表数据 */
+    private List<String> enames;
     /**
      * 表格数据对象
      */
@@ -31,7 +36,23 @@ public class TableDataInfo implements Serializable
     {
     }
-    /**
+    public List<String> getNames() {
+		return names;
+	}
+
+	public void setNames(List<String> names) {
+		this.names = names;
+	}
+
+	public List<String> getEnames() {
+		return enames;
+	}
+
+	public void setEnames(List<String> enames) {
+		this.enames = enames;
+	}
+
+	/**
      * 分页
      * 
      * @param list 列表数据
@@ -109,6 +109,8 @@ export default {
       outside: ["长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"],
       info2:false,
       businessKey:null,
+      names:null,
+      enames:null,
     };
   },
   created() {
@@ -202,7 +204,6 @@ export default {
       }
       dayWorkList(this.queryParams).then(response => {
-
         let list = response.rows;
         for (let i = 0; i < list.length; i++) {
@@ -276,10 +277,14 @@ export default {
       if (tabIdx == 1) {
         this.queryParams.pageNum = 1;
         this.resetQuery();
+        this.names = null;
+        this.ename = null;
         this.queryParams.his = tabIdx;
       } else if (tabIdx == 0) {
         this.queryParams.pageNum = 1;
         this.resetQuery();
+        this.names = null;
+        this.ename = null;
         this.queryParams.his = tabIdx;
       }
@@ -292,6 +297,13 @@ export default {
       dayWorkList(this.queryParams).then(response => {
         this.threestepList = response.rows;
+
+        if(!this.names){
+          this.names = response.names;
+          this.enames = response.enames;
+        }
+
+
         this.queryParams.timeRange = timeRange;
         this.loading.close();
@@ -11,6 +11,35 @@
      </el-option>
    </el-select>
+    <el-select v-model="queryParams.name" filterable  reserve-keyword @change="getList" placeholder="名称">
+      <el-option label="全部" value="" />
+       <el-option v-for="item in names" :label="item" :value="item" >
+       </el-option>
+     </el-select>
+
+    <el-select v-model="queryParams.prev" filterable  reserve-keyword @change="getList" placeholder="上一节点">
+      <el-option label="全部" value="" />
+       <el-option v-for="item in depts" :label="item.name" :value="item.name" >
+       </el-option>
+     </el-select>
+   <el-select v-model="queryParams.type" filterable  reserve-keyword @change="getList">
+      <el-option label="全部" value="" />
+      <el-option label="建筑垃圾许可证审批" value="workflow_constructsite" />
+      <el-option label="消纳合同申报备案" value="workflow_conract" />
+      <el-option label="处理场所备案" value="workflow_earthsites" />
+      <el-option label="运输企业准入流程" value="workflow_company" />
+      <el-option label="运输车辆准入流程" value="workflow_vehicle" />
+      <el-option label="驾驶员信息审批" value="workflow_driver" />
+      <el-option label="交办案卷" value="workflow_caseoffline" />
+      <el-option label="违规案卷处置流程" value="workflow_casefile" />
+      <el-option label="平台预警信息" value="violation_warning" />
+      <el-option label="办文办事" value="handleAffairs" />
+      <el-option label="后勤管理" value="logistics" />
+      <el-option label="会议事务" value="conference" />
+      <el-option label="假勤管理" value="workflow_leave" />
+      <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc" />
+    </el-select>
+
     <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
@@ -208,6 +237,17 @@
     <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
       <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="类型" width="55" align="center" prop="controlName"/>
+        <el-table-column label="审批内容" align="center" prop="controlValue" />
+        <el-table-column label="审批人" align="center" prop="createName" />
+        <el-table-column label="审批时间" align="center" prop="createTime" />
+      </el-table>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
@@ -216,6 +256,18 @@
     <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
       <contractInfo :businessKey="businessKey" v-if="contract"/>
+
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="类型" width="55" align="center" prop="controlName"/>
+        <el-table-column label="审批内容" align="center" prop="controlValue" />
+        <el-table-column label="审批人" align="center" prop="createName" />
+        <el-table-column label="审批时间" align="center" prop="createTime" />
+      </el-table>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
@@ -331,6 +383,18 @@
     <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body :close-on-click-modal="false">
       <supervisionInfo :infoData="supervisionData" v-if="supervisionOpen"/>
+      
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="类型" width="55" align="center" prop="controlName"/>
+        <el-table-column label="审批内容" align="center" prop="controlValue" />
+        <el-table-column label="审批人" align="center" prop="createName" />
+        <el-table-column label="审批时间" align="center" prop="createTime" />
+      </el-table>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -339,6 +403,16 @@
     <el-dialog :title="title" :visible.sync="company" width="700px" append-to-body :close-on-click-modal="false">
       <companyInfo :businessKey="businessKey" v-if="company"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="类型" width="55" align="center" prop="controlName"/>
+        <el-table-column label="审批内容" align="center" prop="controlValue" />
+        <el-table-column label="审批人" align="center" prop="createName" />
+        <el-table-column label="审批时间" align="center" prop="createTime" />
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -347,6 +421,16 @@
     <el-dialog :title="title" :visible.sync="vehicle" width="700px" append-to-body :close-on-click-modal="false">
       <vehicleInfo :businessKey="businessKey" v-if="vehicle"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="类型" width="55" align="center" prop="controlName"/>
+        <el-table-column label="审批内容" align="center" prop="controlValue" />
+        <el-table-column label="审批人" align="center" prop="createName" />
+        <el-table-column label="审批时间" align="center" prop="createTime" />
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -355,6 +439,16 @@
     <el-dialog :title="title" :visible.sync="driver" width="700px" append-to-body :close-on-click-modal="false">
       <driverInfo :businessKey="businessKey" v-if="driver"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="类型" width="55" align="center" prop="controlName"/>
+        <el-table-column label="审批内容" align="center" prop="controlValue" />
+        <el-table-column label="审批人" align="center" prop="createName" />
+        <el-table-column label="审批时间" align="center" prop="createTime" />
+      </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
@@ -375,6 +469,8 @@ import {
   formDataSave
 } from "@/api/activiti/task";
+import { historyFromData } from '@/api/activiti/historyFormdata'
+
 import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign";
@@ -533,6 +629,8 @@ export default {
       company:false,
       driver:false,
       vehicle:false,
+      names:null,
+      hisfromData:[]
     };
   },
   created() {
@@ -596,6 +694,7 @@ export default {
       this.loading = true;
       listTask(this.queryParams).then(response => {
         this.taskList = response.rows;
+        this.names = response.names;
         this.total = response.total;
         this.loading = false;
       });
@@ -637,6 +736,10 @@ export default {
       this.businessKey = row.businessKey;
       this.id = row.id;
       this.taskName = row.name;
+      historyFromData(this.businessKey).then(response => {
+          this.hisfromData = response.data
+      })
+
       formDataShow(row.id).then(response => {
         let datas = response.data;
         let formData = []
@@ -757,6 +860,7 @@ export default {
     /** 提交按钮 */
     submitForm(formid, value) {
+      debugger;
       this.form.formData[0].controlValue = value;
       this.form.formData[0].controlId = formid;
       this.form.id = this.businessKey.split(":")[1];
@@ -21,7 +21,7 @@
     </el-row>
     <el-row class="card_row">
       <el-col :span="24" class="card_grid">
-        <div>申请理由: {{task.reason}}</div>
+        <div>当前节点: {{task.name}}</div>
       </el-col>
     </el-row>
@@ -30,7 +30,7 @@
           <div>申请类型: {{task.type}}</div>
         </el-col>
       <el-col :span="12" class="card_grid right">
-        <div>创建时间: {{task.createdDate}}</div>
+        <div>接收时间: {{task.createdDate}}</div>
       </el-col>
     </el-row>
   </el-card>
@@ -13,13 +13,20 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="工地名称" >
-            <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" />
+            <!-- <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" /> -->
+
+            <el-select v-model="queryParams.name" placeholder="请输入工地名称 " filterable  size="small">
+              <el-option v-for="item in names" :label="item" :value="item" />
+            </el-select>
           </el-form-item>
       </el-col>
         <el-col :span="6">
           <el-form-item label="处理场所名称" >
-            <el-input v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称"  size="small"
-               />
+            <!-- <el-input v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称"  size="small"  />-->
+
+               <el-select v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称 " filterable   size="small">
+                 <el-option v-for="item in enames" :label="item" :value="item" />
+               </el-select>
           </el-form-item>
       </el-col>
         <el-col :span="6">
@@ -69,17 +69,12 @@ public class SupervisionThreestepController extends BaseController
         startPage();
         if(supervisionThreestep.getStatus() == null){
         	supervisionThreestep.setCreateBy(SecurityUtils.getUsername());
-        
         }else{
-        	
-      
 	        Map<String, String> map = new HashMap<String, String>();
 	        map.put("type", "CSUserDepartmentType");
 	        JSONArray depts = RemoteServerUtils.getDict(map);
 	        JSONArray areas = RemoteServerUtils.getAreas();
-	        
-	        
 	        for(Object object :depts){
 	        	JSONObject dept = (JSONObject) object;
 	        	List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
@@ -140,7 +135,7 @@ public class SupervisionThreestepController extends BaseController
     public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep)
     {
 //        startPage();
-        PageDomain pageDomain = TableSupport.buildPageRequest();
+    	PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
@@ -170,7 +165,22 @@ public class SupervisionThreestepController extends BaseController
         JSONArray areas = RemoteServerUtils.getAreas();
+        List<String> names = new ArrayList<>();
+        List<String> enames = new ArrayList<>();
+        
         for(Map<String, String> m:list){
+        	
+        	if(names.indexOf(m.get("name")) == -1){
+
+            	names.add(m.get("name"));
+        	}
+        	
+        	if(enames.indexOf(m.get("ename")) == -1){
+
+            	enames.add(m.get("ename"));
+        	}
+        	
+        	
         	for(Object object:areas){
         		JSONObject area = (JSONObject)object;
@@ -216,6 +226,9 @@ public class SupervisionThreestepController extends BaseController
         info.setRows(list);
+        info.setNames(names);
+        info.setEnames(enames);
+        
         info.setMsg(string + place+"工地开工数量" + count + "  "  + place1+"处理场所开工数量" + count1);
         return info;