m

youxiw2000
1 parent bcf7be75
Showing 5 changed files with 40 additions and 35 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-ui/src/views/daily/situation/index.vue
trash-ui/src/views/daily/toollist/index.vue
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -26,6 +26,7 @@ import org.activiti.api.task.runtime.TaskRuntime;
 import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.TaskQueryImpl;
+import org.activiti.engine.query.QueryProperty;
 import org.activiti.engine.task.IdentityLink;
 import org.activiti.engine.task.IdentityLinkType;
 import org.activiti.engine.task.NativeTaskQuery;
@@ -106,8 +107,6 @@ public class myTaskServiceImpl implements myTaskService {
     @Override
     public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
-
-        long time = new Date().getTime();
         TaskQuery crossQuery = taskService.createTaskQuery();
@@ -142,7 +141,6 @@ public class myTaskServiceImpl implements myTaskService {
             }
     	}
-        System.out.println(new Date().getTime() - time);
         for(org.activiti.engine.task.Task t1:list1){
@@ -154,18 +152,16 @@ public class myTaskServiceImpl implements myTaskService {
         	}
         }
-        System.out.println(new Date().getTime() - time);
         for(org.activiti.engine.task.Task tasks : userQuery.list()){
         	pid.add(tasks.getProcessInstanceId());
         }
-        System.out.println(new Date().getTime() - time);
         if(pid.size() > 0){
-    		taskQuery.processInstanceIdIn(pid);
+    		taskQuery.processInstanceIdIn(pid).orderByTaskCreateTime().desc();
         }else{
-        	taskQuery.taskAssignee(SecurityUtils.getUsername());
+        	taskQuery.taskAssignee(SecurityUtils.getUsername()).orderByTaskCreateTime().desc();
         }
@@ -173,7 +169,6 @@ public class myTaskServiceImpl implements myTaskService {
         List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(),
                 pageable.getMaxItems()));
-        System.out.println(new Date().getTime() - time);
         return new PageImpl<>(tasks,Math.toIntExact(taskQuery.count()));
     }
@@ -24,14 +24,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
 	<select id="selectWorkByIds"  parameterType="String" resultType="java.util.Map">
-	   	select start_time as startTime,end_time as endTime, reason,type,instance_id from workflow where id in
+	   	select start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime from workflow where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
 	</select>
 	<select id="selectHistoryWorkByPIds"  parameterType="String" resultType="java.util.Map">
-	   	select start_time as startTime,end_time as endTime, reason,type,instance_id from workflow_hi where instance_id in
+	   	select start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime from workflow_hi where instance_id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -16,7 +16,7 @@
           placeholder="请输入操作人"
           size="small"
-
+          
         />
       </el-form-item>
       <el-form-item>
@@ -121,11 +121,10 @@
             </el-col>
           <el-col>
             <el-form-item label="操作人" prop="operator">
-              <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px"/>
+              <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-form-item label="全市工地,消纳场开停情况"  prop="consumptionSiteSituation">
           <editor v-model="form.consumptionSiteSituation" :min-height="192"/>
         </el-form-item>
@@ -168,12 +167,14 @@
 import { listSituation, getSituation, delSituation, addSituation, updateSituation, exportSituation } from "@/api/daily/situation";
 import Editor from '@/components/Editor';
 import {getToollist} from "@/api/daily/toollist";
-
+import store from "@/store";
 export default {
   name: "Situation",
   components: { Editor },
   data() {
     return {
+
+      userName:store.getters.name,
       // 遮罩层
       loading: true,
       border:true,
@@ -218,6 +219,15 @@ export default {
         consumptionSiteSituation: [
           { required: true, message: "不能为空", trigger: "blur" }
         ],
+      },
+      dayForDate:{
+        0:"日",
+        1:"一",
+        2:"二",
+        3:"三",
+        4:"四",
+        5:"五",
+        6:"六",
       }
     };
   },
@@ -227,11 +237,8 @@ export default {
   methods: {
     selectDate(date){
-      let day = new Date(date).getDay();
-      if(day == 0){
-        day = 7;
-      }
+      let day = this.dayForDate[new Date(this.form.date).getDay()];
       this.dayOfWeek = day;
@@ -287,6 +294,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加每日工作清单";
+      
+      
+      this.form.operator = this.userName;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -295,11 +305,7 @@ export default {
       getSituation(id).then(response => {
         this.form = response.data;
-        let day = new Date(this.form.date).getDay();
-
-        if(day == 0){
-          day = 7;
-        }
+        let day = this.dayForDate[new Date(this.form.date).getDay()];
         this.dayOfWeek = day;
@@ -315,11 +321,7 @@ export default {
       getSituation(id).then(response => {
         this.form = response.data;
-        let day = new Date(this.form.date).getDay();
-
-        if(day == 0){
-          day = 7;
-        }
+        let day = this.dayForDate[new Date(this.form.date).getDay()];
         this.dayOfWeek = day;
@@ -5,18 +5,18 @@
         <el-input
           v-model="queryParams.title"
           placeholder="请输入标题"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="操作人" prop="operator">
         <el-input
           v-model="queryParams.operator"
           placeholder="请输入操作人"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item>
@@ -93,7 +93,7 @@
         <el-row type="flex" justify="center">
             <el-col :span='12'>
               <el-form-item label="操作人" prop="operator">
-                <el-input v-model="form.operator" placeholder="请输入操作人" />
+                <el-input v-model="form.operator" placeholder="请输入操作人" disabled/>
               </el-form-item>
             </el-col>
                 <el-col :span='12'>
@@ -169,6 +169,7 @@
 <script>
 import { listToollist, getToollist, delToollist, addToollist, updateToollist, exportToollist } from "@/api/daily/toollist";
 import Editor from '@/components/Editor';
+import store from "@/store";
 import {
     earthsitesList,
     constructionsitesList,
@@ -181,6 +182,7 @@ export default {
   components: { Editor },
   data() {
     return {
+      userName:store.getters.name,
       // 遮罩层
       loading: true,
       border:true,
@@ -316,7 +318,8 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-        this.edit = true;
+      this.form.operator = this.userName;
+      this.edit = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -152,7 +152,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             workflow.setType(map.get("type").toString());
             workflow.setInstanceId(processInstance.getId());
             workflow.setState("0");
-
+            workflow.setCreateTime(new Date());
             return workflowMapper.insertWorkflow(workflow);
         } catch (Exception e) {
@@ -200,6 +200,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             workflow.setInstanceId(processInstance.getId());
+            workflow.setCreateTime(new Date());
             return workflowMapper.insertWorkflow(workflow);
         } catch (Exception e) {
@@ -234,6 +235,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             workflow.setType(supervision.getType() == 0 ? "工地" : "消纳场");
             workflow.setInstanceId(processInstance.getId());
             workflow.setState("0");
+            workflow.setCreateTime(new Date());
             return workflowMapper.insertWorkflow(workflow);
         } catch (Exception e) {
@@ -282,6 +284,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             workflow.setType("案卷");
             workflow.setInstanceId(processInstance.getId());
             workflow.setState("0");
+            workflow.setCreateTime(new Date());
             return workflowMapper.insertWorkflow(workflow);
         } catch (Exception e) {
@@ -341,6 +344,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             workflow.setType("违规预警信息案卷");
             workflow.setInstanceId(instance.getId());
             workflow.setState("0");
+            workflow.setCreateTime(new Date());
             return workflowMapper.insertWorkflow(workflow);
         } catch (Exception e) {
@@ -378,6 +382,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             workflow.setType("案卷");
             workflow.setInstanceId(processInstance.getId());
             workflow.setState("0");
+            workflow.setCreateTime(new Date());
             return workflowMapper.insertWorkflow(workflow);
         } catch (Exception e) {