更新task跟踪查询

dev-config/src/main/java/com/tykj/dev/config/Log.java

+package com.tykj.dev.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Log注解
+ * @author dengdiyi
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Log {
+    String type() default "";
+}

dev-config/src/main/java/com/tykj/dev/config/LogAspect.java

+package com.tykj.dev.config;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+/**
+ * 业务操作日志aop
+ */
+@Aspect
+@Component
+public class LogAspect {
+
+    /**
+     * 请求中的所有参数
+     */
+    private Object[] args;
+
+    /**
+     * 请求中的所有参数名
+     */
+    private String[] paramNames;
+
+    /**
+     * 参数类
+     */
+    private Param params;
+
+    /**
+     * 业务操作日志定义切入点
+     */
+    public void opreationLog(){
+
+    }
+}

dev-config/src/main/java/com/tykj/dev/config/Param.java

+package com.tykj.dev.config;
+
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ * 日志参数类
+ */
+@Data
+public class Param {
+    /**
+     * 所有可能存储在业务日志中的参数
+     */
+    private String id;
+    private String age;
+    private String workOrderNumber;
+    private String userId;
+    private String name;
+    private String email;
+}

dev-destroy/src/main/java/com/tykj/dev/device/destroy/controller/DeviceDestroyController.java

@@ -188,8 +188,6 @@ public class DeviceDestroyController {
             deviceDestroyBill.setDestroyTime(new Date());
             //为账单新增文号
             deviceDestroyBill.setDocNumber(this.deviceDestroyBillService.getNewDocNumber());
-            //变更任务状态
-            task.setBillStatus(StatusEnum.DESTROY_BUSINESS_CONFIRM_FINISH_SUCCESS.id);
             //将任务推进至完结
             taskService.moveToEnd(task);
             taskService.update(task);

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -17,21 +17,17 @@ public enum StatusEnum {
      */
     CREATE_RFID_BUSINESS(8100,"标签制作业务开始"),
     RFID_BUSINESS_NEED_CONFIRM(8101,"等待审核"),
-    RFID_BUSINESS_CONFIRM_FINISH_SUCCESS(8102,"审核成功"),
-    RFID_BUSINESS_CONFIRM_FINISH_FAILED(8103,"审核失败"),
 
     /**
      * 销毁业务
      */
-    CREATE_DESTROY_BUSINESS(8110,"标签制作业务开始"),
+    CREATE_DESTROY_BUSINESS(8110,"装备销毁业务开始"),
     DESTROY_BUSINESS_NEED_CONFIRM(8111,"等待审核"),
-    DESTROY_BUSINESS_CONFIRM_FINISH_SUCCESS(8112,"审核成功"),
-    DESTROY_BUSINESS_CONFIRM_FINISH_FAILED(8113, "审核失败"),
 
     /**
      * 退装业务
      */
-    CREATE_RETIRED_BUSINESS(8120, "标签制作业务开始"),
+    CREATE_RETIRED_BUSINESS(8120, "退装业务开始"),
     RETIRED_BUSINESS_NEED_CONFIRM(8121, "等待审核"),
     RETIRED_BUSINESS_CONFIRM_FINISH_SUCCESS(8122, "审核成功"),
     RETIRED_BUSINESS_CONFIRM_FINISH_FAILED(8123, "审核失败"),

dev-retired/src/main/java/com/tykj/dev/device/retired/controller/DeviceRetiredController.java

@@ -106,7 +106,6 @@ public class DeviceRetiredController {
         Task task = taskService.start(initTaskBto(retiredBill));
         //生成任务日志
         taskLogService.addLog(new TaskLogBto(task.getId(), "发起退装", null));
-        taskLogService.addLog(new TaskLogBto(task.getId(), "退装待审核", null));
         myWebSocket.sendMessage1();
         return ResultUtil.success("退装申请成功");
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -134,13 +134,11 @@ public class RfidController {
             rfidChangeLogService.addEntity(initRfidChangeLog(currentUserInfo, rfidChangeBillSaved, d));
             //生成装备变更日志
             deviceLogService.addLog(new DeviceLogDto(d.getDeviceId(),"发起标签替换",billList));
-            deviceLogService.addLog(new DeviceLogDto(d.getDeviceId(),"标签替换待审核",billList));
         });
         //生成Task
         Task task = taskService.start(initTaskBto(currentUserInfo, rfidChangeBillSaved));
         //生成任务日志
         taskLogService.addLog(new TaskLogBto(task.getId(),"发起标签替换",billList));
-        taskLogService.addLog(new TaskLogBto(task.getId(),"标签替换待审核",billList));
         myWebSocket.sendMessage1();;
         return ResultUtil.success("标签修改申请成功");
     }

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -471,6 +471,7 @@ public class TaskServiceImpl implements TaskService {
     private List<TaskUserVo> getTaskUserVoList(TaskSelectVo taskSelectVo) {
         Integer userId = userUtils.getCurrentUserId();
         Integer bussinessType = taskSelectVo.getBusinessType();
+        Integer unitId = userUtils.getCurrentUnitId();
         //筛选出未完结和未封存业务，映射成bto
         List<TaskBto> taskBtos = taskDao.findAll().stream()
                 .filter(task -> (!task.getBillStatus().equals(StatusEnum.END.id))&&(!task.getBillStatus().equals(StatusEnum.ARCHIVE.id)))
@@ -517,6 +518,11 @@ public class TaskServiceImpl implements TaskService {
             List<TaskBto> taskBtoList = taskBtos.stream()
                     .filter(taskBto -> taskBto.getInvolveUserIdList().contains(userId)&&!userId.equals(taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint())))
                     .collect(Collectors.toList());
+            //涉及人员当前指针为-1，且所属单位为当前单位
+            List<TaskBto> taskBtos1 = taskBtos.stream()
+                    .filter(taskBto -> taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint())==-1&&taskBto.getOwnUnit().equals(unitId))
+                    .collect(Collectors.toList());
+            taskBtoList.addAll(taskBtos1);
             //查询所有业务
             if (bussinessType == null) {
                 List<TaskUserVo> taskUserVos = taskBtoList.stream().map(TaskBto::toVo).collect(Collectors.toList());

dev-union/src/test/java/com/tykj/dev/repair/RepairControllerTest.java

@@ -41,8 +41,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @SuppressWarnings("ALL")
 @WithMockUser(username = "shia", password = "qwer1234", authorities = "市A专管员")
 @ActiveProfiles("dev")
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes= BeanConfig.class)
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@ContextConfiguration(classes= BeanConfig.class)
 public class RepairControllerTest extends BaseTest {
 
     @Autowired
@@ -66,6 +66,7 @@ public class RepairControllerTest extends BaseTest {
      */
     @Test
     public void createRepairTest() throws Exception{
+        Integer level = userUtils.getCurrentUnitLevel();
         RepairBillSaveVo repairBillSaveVo = new RepairBillSaveVo();
         repairBillSaveVo.setStartUseraId(3);
         repairBillSaveVo.setStartUserbId(4);
@@ -116,7 +117,7 @@ public class RepairControllerTest extends BaseTest {
                 .andExpect(status().isOk())
                 .andDo(mvcResult1 -> System.out.println("[测试结果] 对任务id="+initTask.getId()+"的任务发起维修审核成功，维修单id为"+initTask.getBillId()));
         //如果是省向国家发起的
-        if (userUtils.getCurrentUnitLevel()==1){
+        if (level==1){
             System.out.println("等待国家维修装备退回");
         }
         else {
@@ -170,7 +171,7 @@ public class RepairControllerTest extends BaseTest {
                     .andReturn();
             String body = result.getResponse().getContentAsString();
             ResultObj resultObj = JSONObject.parseObject(body,ResultObj.class);
-            System.out.println("出库装备详情:"+resultObj.getData());
+            System.out.println("返回值:"+resultObj.getData());
         }
     }
 }