运维修改

lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/controller/WorkOrderController.java

@@ -1,44 +1,33 @@
 package org.springblade.plugin.operation.workorder.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.flowable.engine.history.HistoricProcessInstance;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.plugin.operation.database.excel.DatabaseExcel;
 import org.springblade.plugin.operation.task.entity.TaskInfo;
 import org.springblade.plugin.operation.task.service.ITaskInfoService;
 import org.springblade.plugin.operation.workorder.entity.WorkOrder;
-import org.springblade.plugin.operation.workorder.excel.WorkOrderExcel;
 import org.springblade.plugin.operation.workorder.service.IWorkOrderService;
-import org.springblade.plugin.workflow.process.model.WfProcess;
 import org.springblade.system.cache.DictBizCache;
-import org.springblade.system.entity.AuthClient;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 工单
- *
  * @Description
  * @Author lt
  * @Date 2023年2月17日09:46:45
@@ -55,8 +44,6 @@ public class WorkOrderController extends BladeController {
     private final ISysClient sysClient;
     private final IUserClient userClient;
 
-
-
     /**
      * 历史工单
      */
@@ -113,5 +100,27 @@ public class WorkOrderController extends BladeController {
         workOrderService.exportExcel(workOrder, response);
     }
 
+    /**
+     * 实施提交
+     */
+    @PostMapping("/submit")
+    public R submit(@RequestBody WorkOrder workOrder) {
+        workOrder.setIsFinish(1);
+        workOrder.setFinishTime(new Date());
+        return R.data(workOrderService.updateById(workOrder));
+    }
+
+    /**
+     * 实施记录(新)
+     */
+    @GetMapping("/workOrderRecord")
+    public R<IPage<WorkOrder>> workOrderRecord(WorkOrder workOrder, Query query) {
+        LambdaQueryWrapper<WorkOrder> wrapper = new LambdaQueryWrapper<>(workOrder);
+        wrapper.eq(WorkOrder::getManagement, AuthUtil.getDeptId());
+        wrapper.orderByDesc(WorkOrder::getCreateTime);
+        IPage<WorkOrder> page = workOrderService.page(Condition.getPage(query), wrapper);
+        return R.data(page);
+    }
+
 
 }

lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/entity/WorkOrder.java

@@ -61,6 +61,9 @@ public class WorkOrder extends TenantEntity {
     //完成时间
     private Date finishTime;
 
+    //备注
+    private String remark;
+
     // 结束时间
     @TableField(exist = false)
     private Date endTime;
@@ -81,5 +84,6 @@ public class WorkOrder extends TenantEntity {
     @TableField(exist = false)
     private Date endTime2;
 
+    //上传文件JSON
     private String uploadRecord;
 }

lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java

@@ -2,6 +2,7 @@ package org.springblade.plugin.operation.workorder.service.impl;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;
@@ -90,10 +91,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         IPage<WorkOrder> page = new Page<>();
 
         String taskUser = WfTaskUtil.getTaskUser();
-        String taskGroup = WfTaskUtil.getCandidateGroup();
+//        String taskGroup = WfTaskUtil.getCandidateGroup();
         //当前获取登录人deptid
-        String deptId = AuthUtil.getDeptId();
-        List<Long> nowUserDepts = Func.toLongList(deptId);
+//        String deptId = AuthUtil.getDeptId();
+//        List<Long> nowUserDepts = Func.toLongList(deptId);
 
 
         TaskQuery taskQuery = taskService.createTaskQuery()
@@ -150,9 +151,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
             order.setTaskId(task.getId());
             order.setProcessInstanceId(task.getProcessInstanceId());
+            order.setStatus(0);
             workOrders.add(order);
         }
 
+        // 工单记录
+        LambdaQueryWrapper<WorkOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WorkOrder::getMaintenanceCompany, AuthUtil.getUserId());
+        wrapper.eq(WorkOrder::getIsFinish, 0);
+        List<WorkOrder> list = list(wrapper);
+        workOrders.addAll(list);
+
         // 任务父类
         if (StringUtils.isNotBlank(workOrder.getTaskParent())) {
             workOrders = workOrders.stream().filter(s -> s.getTaskParent().equals(workOrder.getTaskParent())).collect(Collectors.toList());
@@ -173,11 +182,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             workOrders = workOrders.stream().filter(s -> s.getManagement().equals(workOrder.getManagement())).collect(Collectors.toList());
         }
 
-        // 任务级别
-//        if (StringUtils.isNotBlank(workOrder.getTaskType())) {
-//            workOrders = workOrders.stream().filter(s -> s.getTaskType().equals(workOrder.getTaskType())).collect(Collectors.toList());
-//        }
-
         // 审批状态
         if (StringUtils.isNotBlank(workOrder.getApprovalStatus())) {
             workOrders = workOrders.stream().filter(s -> s.getApprovalStatus().equals(workOrder.getApprovalStatus())).collect(Collectors.toList());
@@ -193,6 +197,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             workOrders = workOrders.stream().filter(s -> (s.getCreateTime().after(workOrder.getStartTime())) && (s.getCreateTime().before(workOrder.getEndTime()))).collect(Collectors.toList());
         }
 
+        // 总条数
         page.setTotal(workOrders.size());
 
         // 分页
@@ -379,11 +384,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         varMap.put("currentResponsiblePerson", "--");
                     }
                     // 审批状态
-                    if (task.getName().contains("审批")) {
+//                    if (task.getName().contains("审批")) {
                         varMap.put("status", "审批中");
-                    } else {
-                        varMap.put("status", "进行中");
-                    }
+//                    } else {
+//                        varMap.put("status", "进行中");
+//                    }
                 } else {
                     varMap.put("currentResponsiblePerson", "--");
                     varMap.put("status", "已完成");