Selaa lähdekoodia

20230927-管理员工单获取逻辑修改

iaun 3 vuotta sitten
vanhempi
sitoutus
24c13cb0e3

+ 8 - 2
src/main/java/cn/iaun/it/controller/ItItsmController.java

@@ -127,6 +127,8 @@ public class ItItsmController {
         itItsmOrder.setOrderStatus(0);
         itItsmOrder.setOrderName(reqVo.getOrderName());
         itItsmOrder.setCreateTime(new Date());
+        itItsmOrder.setProcessed(0);
+        itItsmOrder.setProcessedUser(templateUserId);
         int result = itItsmService.addItsmOrder(itItsmOrder);
 
         ItItsmLog log = new ItItsmLog();
@@ -192,6 +194,7 @@ public class ItItsmController {
                     updateData.setOrderStatus(1);
                     updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
                     updateData.setReply(submitOrderReqVo.getReply());
+                    updateData.setProcessed(1);
 
                     if (submitOrderReqVo.getRemark().isEmpty()) {
                         log.setLog("已通过");
@@ -209,6 +212,7 @@ public class ItItsmController {
                     }
                     updateData.setOrderStatus(2);
                     updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
+                    updateData.setProcessed(1);
 
                     if (submitOrderReqVo.getRemark().isEmpty()) {
                         log.setLog("已退回");
@@ -241,6 +245,8 @@ public class ItItsmController {
                     updateData.setOrderStatus(0);
                     updateData.setCurrentUserId(template.getTemplateUser());
                     updateData.setData(submitOrderReqVo.getData());
+                    updateData.setProcessed(0);
+                    updateData.setProcessedUser(template.getTemplateUser());
                     log.setLog("重新提交");
                 }
                 break;
@@ -269,14 +275,14 @@ public class ItItsmController {
     }
 
     @PostMapping("/admin/order/get")
-    public Result<MyPage<ItItsmOrder>> adminGetOrders(@RequestBody @Validated AdminGetOrderVo vo, @RequestAttribute("userId") Long userId) {
+    public Result<MyPage<OrderVo>> adminGetOrders(@RequestBody @Validated AdminGetOrderVo vo, @RequestAttribute("userId") Long userId) {
         if (vo.getPageNo() == null) {
             vo.setPageNo(1);
         }
         if (vo.getPageSize() == null) {
             vo.setPageSize(20);
         }
-        IPage<ItItsmOrder> page = itItsmService.adminGetItsmOrder(vo.getPageNo(), vo.getPageSize(), userId, vo.getProcessed());
+        IPage<OrderVo> page = itItsmService.adminGetItsmOrder(vo.getPageNo(), vo.getPageSize(), userId, vo.getProcessed());
         return new Result<>(ResultCode.SUCCESS, new MyPage<>(page));
     }
 

+ 1 - 1
src/main/java/cn/iaun/it/mapper/ItItsmOrderMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 public interface ItItsmOrderMapper extends BaseMapper<ItItsmOrder> {
     ItItsmOrder getOrderById(Long orderId);
 
-    IPage<ItItsmOrder> adminGetOrder(IPage<ItItsmOrder> page, Long userId, Boolean processed);
+    IPage<OrderVo> adminGetOrder(IPage<OrderVo> page, Long userId, Boolean processed);
 
     OrderVo getOrderByIdExt(Long orderId, Long userId);
 

+ 20 - 0
src/main/java/cn/iaun/it/model/ItItsmOrder.java

@@ -23,6 +23,8 @@ public class ItItsmOrder {
     private Integer evaluate;
     private String comment;
     private Date createTime;
+    private Integer processed;
+    private Long processedUser;
 
     @Override
     public String toString() {
@@ -38,9 +40,27 @@ public class ItItsmOrder {
                 ", evaluate=" + evaluate +
                 ", comment='" + comment + '\'' +
                 ", createTime=" + createTime +
+                ", processed=" + processed +
+                ", processedUser=" + processedUser +
                 '}';
     }
 
+    public Long getProcessedUser() {
+        return processedUser;
+    }
+
+    public void setProcessedUser(Long processedUser) {
+        this.processedUser = processedUser;
+    }
+
+    public Integer getProcessed() {
+        return processed;
+    }
+
+    public void setProcessed(Integer processed) {
+        this.processed = processed;
+    }
+
     public String getOrderName() {
         return orderName;
     }

+ 1 - 1
src/main/java/cn/iaun/it/service/ItItsmService.java

@@ -55,7 +55,7 @@ public interface ItItsmService {
 
     OrderVo getOrderByOrderIdExt(Long orderId, Long userId);
 
-    IPage<ItItsmOrder> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed);
+    IPage<OrderVo> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed);
 
     // 流程日志
     List<ItItsmLog> getItsmLogByOrderId(Long orderId);

+ 2 - 2
src/main/java/cn/iaun/it/service/impl/ItItsmServiceImpl.java

@@ -142,8 +142,8 @@ public class ItItsmServiceImpl implements ItItsmService {
     }
 
     @Override
-    public IPage<ItItsmOrder> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed) {
-        Page<ItItsmOrder> page = new Page<>(pageNo, pageSize);
+    public IPage<OrderVo> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed) {
+        Page<OrderVo> page = new Page<>(pageNo, pageSize);
         return itItsmOrderMapper.adminGetOrder(page, userId, processed);
     }
 

+ 5 - 3
src/main/resources/db/schema.sql

@@ -225,10 +225,12 @@ CREATE TABLE `it_itsm_order`
     `current_user_id` BIGINT(19)   NOT NULL,
     `data`            TEXT         NOT NULL,
     `order_status`    TINYINT(3)   NOT NULL,
-    `reply`           TEXT         NULL DEFAULT NULL,
-    `evaluate`        TINYINT(3)   NULL DEFAULT NULL,
-    `comment`         TEXT         NULL DEFAULT NULL,
+    `reply`           TEXT         NULL     DEFAULT NULL,
+    `evaluate`        TINYINT(3)   NULL     DEFAULT NULL,
+    `comment`         TEXT         NULL     DEFAULT NULL,
     `create_time`     TIMESTAMP    NOT NULL,
+    `processed`       TINYINT(3)   not null default 0,
+    `processed_user`  BIGINT(19)   NULL     DEFAULT NULL,
     PRIMARY KEY (`order_id`)
 ) COMMENT ='工单'
 ;

+ 19 - 18
src/main/resources/mapper/ItItsmOrderMapper.xml

@@ -17,27 +17,28 @@
         from it_itsm_order
         where order_id = #{orderId};
     </select>
-    <select id="adminGetOrder" resultType="cn.iaun.it.model.ItItsmOrder">
-        select `order_id`,
-        `order_name`,
-        `template_id`,
-        `user_id`,
-        `current_user_id`,
-        `data`,
-        `order_status`,
-        `reply`,
-        `evaluate`,
-        `comment`,
-        `create_time`
-        from it_itsm_order where
+    <select id="adminGetOrder" resultType="cn.iaun.it.model.vo.itsm.OrderVo">
+        select
+        `iio`.`order_id` as `order_id`,
+        `iio`.`order_name` as `order_name`,
+        `iio`.`template_id` as `template_id`,
+        `iio`.`user_id` as `user_Id`,
+        `iio`.`current_user_id` as `current_user_id`,
+        `iio`.`order_status` as `order_status`,
+        `iio`.`create_time` as `create_time`,
+        `iit`.`name` AS `template_name`,
+        `iu`.`display_name` AS `current_user_name`
+        from `it_itsm_order` iio
+        LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
+        LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
+        where
         <if test="processed">
-            `order_status` = 0
-            and `order_id` IN (select distinct `il`.`order_id` from `it_itsm_log` `il` where `il`.`user_id` =
-            #{userId})
+            `processed_user` = #{userId}
+            AND `processed` = 1
         </if>
         <if test="!processed">
-            `current_user_id` = #{userId}
-            AND `order_status` != 3
+            `processed_user` = #{userId}
+            AND `processed` = 0
         </if>
         order by `create_time` desc
     </select>