Explorar o código

20230921-修改细节

iaun %!s(int64=3) %!d(string=hai) anos
pai
achega
a18fdc9643

+ 15 - 4
src/main/java/cn/iaun/it/controller/ItItsmController.java

@@ -4,6 +4,8 @@ import cn.iaun.it.model.ItItsmLog;
 import cn.iaun.it.model.ItItsmOrder;
 import cn.iaun.it.model.ItItsmTemplate;
 import cn.iaun.it.model.ItItsmTemplateField;
+import cn.iaun.it.model.vo.itsm.OrderVo;
+import cn.iaun.it.model.vo.itsm.TemplateVo;
 import cn.iaun.it.model.vo.itsm.controller.*;
 import cn.iaun.it.model.vo.user.ItUserVo;
 import cn.iaun.it.service.ItItsmService;
@@ -105,7 +107,7 @@ public class ItItsmController {
     }
 
     @PostMapping("/order/create")
-    public Result<?> createOrder(@Validated @RequestBody CreateOrderReqVo reqVo, @RequestAttribute("userId") Long userId) {
+    public Result<Long> createOrder(@Validated @RequestBody CreateOrderReqVo reqVo, @RequestAttribute("userId") Long userId) {
         ItItsmTemplate templateInfo = itItsmService.getItsmTemplateByTemplateId(reqVo.getTemplateId());
         if (templateInfo == null) {
             return new Result<>(ResultCode.FAILED_PARAM_INVALID);
@@ -117,8 +119,10 @@ public class ItItsmController {
         itItsmOrder.setTemplateId(reqVo.getTemplateId());
         itItsmOrder.setData(reqVo.getData());
         itItsmOrder.setOrderStatus(0);
+        itItsmOrder.setOrderName(reqVo.getOrderName());
+        itItsmOrder.setCreateTime(new Date());
         int result = itItsmService.addItsmOrder(itItsmOrder);
-        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, itItsmOrder.getOrderId());
     }
 
     @PostMapping("/order/submit")
@@ -126,6 +130,7 @@ public class ItItsmController {
         submitOrderReqVo.setTemplateId(null);
         submitOrderReqVo.setCurrentUserId(null);
         submitOrderReqVo.setOrderStatus(null);
+        submitOrderReqVo.setOrderName(null);
         if (submitOrderReqVo.getOrderId() == null) {
             return new Result<>(ResultCode.FAILED_PARAM_INVALID);
         }
@@ -216,15 +221,21 @@ public class ItItsmController {
         return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
     }
 
+    @PostMapping("/order/get-by-id/{i}")
+    public Result<OrderVo> getOrderById(@PathVariable String i, @RequestAttribute("userId") Long userId) {
+        Long orderId = Long.parseLong(i);
+        return new Result<>(ResultCode.SUCCESS, itItsmService.getOrderByOrderIdExt(orderId, userId));
+    }
+
     @PostMapping("/order/get")
-    public Result<MyPage<ItItsmOrder>> getMyOrders(@RequestBody @Validated GetOrderVo getOrderVo, @RequestAttribute("userId") Long userId) {
+    public Result<MyPage<OrderVo>> getMyOrders(@RequestBody @Validated GetOrderReqVo getOrderVo, @RequestAttribute("userId") Long userId) {
         if (getOrderVo.getPageNo() == null) {
             getOrderVo.setPageNo(1);
         }
         if (getOrderVo.getPageSize() == null) {
             getOrderVo.setPageSize(20);
         }
-        IPage<ItItsmOrder> page = itItsmService.getItsmOrderByIds(getOrderVo.getPageNo(), getOrderVo.getPageSize(), userId, getOrderVo.getOrderStatus());
+        IPage<OrderVo> page = itItsmService.getItsmOrderByStatusExt(getOrderVo.getPageNo(), getOrderVo.getPageSize(), userId, getOrderVo.getOrderStatus());
         return new Result<>(ResultCode.SUCCESS, new MyPage<>(page));
     }
 

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

@@ -1,6 +1,7 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItItsmOrder;
+import cn.iaun.it.model.vo.itsm.OrderVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -10,4 +11,8 @@ public interface ItItsmOrderMapper extends BaseMapper<ItItsmOrder> {
     ItItsmOrder getOrderById(Long orderId);
 
     IPage<ItItsmOrder> adminGetOrder(IPage<ItItsmOrder> page, Long userId, Boolean processed);
+
+    OrderVo getOrderByIdExt(Long orderId, Long userId);
+
+    IPage<OrderVo> getOrderByStatusExt(IPage<OrderVo> page, Long userId, Integer orderStatus);
 }

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

@@ -1,7 +1,7 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItItsmTemplate;
-import cn.iaun.it.model.vo.itsm.controller.TemplateVo;
+import cn.iaun.it.model.vo.itsm.TemplateVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

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

@@ -3,11 +3,15 @@ package cn.iaun.it.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 public class ItItsmOrder {
     @TableId(type = IdType.AUTO)
     private Long orderId;
+    @NotBlank
+    private String orderName;
     @NotNull
     private Long templateId;
     private Long userId;
@@ -18,11 +22,13 @@ public class ItItsmOrder {
     private String reply;
     private Integer evaluate;
     private String comment;
+    private Date createTime;
 
     @Override
     public String toString() {
         return "ItItsmOrder{" +
                 "orderId=" + orderId +
+                ", orderName='" + orderName + '\'' +
                 ", templateId=" + templateId +
                 ", userId=" + userId +
                 ", currentUserId=" + currentUserId +
@@ -31,9 +37,26 @@ public class ItItsmOrder {
                 ", reply='" + reply + '\'' +
                 ", evaluate=" + evaluate +
                 ", comment='" + comment + '\'' +
+                ", createTime=" + createTime +
                 '}';
     }
 
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public Long getUserId() {
         return userId;
     }

+ 32 - 0
src/main/java/cn/iaun/it/model/vo/itsm/OrderVo.java

@@ -0,0 +1,32 @@
+package cn.iaun.it.model.vo.itsm;
+
+import cn.iaun.it.model.ItItsmOrder;
+
+public class OrderVo extends ItItsmOrder {
+    private String templateName;
+    private String currentUserName;
+
+    @Override
+    public String toString() {
+        return "OrderVo{" +
+                "templateName='" + templateName + '\'' +
+                ", currentUserName='" + currentUserName + '\'' +
+                "} " + super.toString();
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getCurrentUserName() {
+        return currentUserName;
+    }
+
+    public void setCurrentUserName(String currentUserName) {
+        this.currentUserName = currentUserName;
+    }
+}

+ 1 - 1
src/main/java/cn/iaun/it/model/vo/itsm/controller/TemplateVo.java → src/main/java/cn/iaun/it/model/vo/itsm/TemplateVo.java

@@ -1,4 +1,4 @@
-package cn.iaun.it.model.vo.itsm.controller;
+package cn.iaun.it.model.vo.itsm;
 
 import cn.iaun.it.model.ItItsmTemplate;
 

+ 12 - 0
src/main/java/cn/iaun/it/model/vo/itsm/controller/CreateOrderReqVo.java

@@ -1,5 +1,6 @@
 package cn.iaun.it.model.vo.itsm.controller;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 public class CreateOrderReqVo {
@@ -7,15 +8,26 @@ public class CreateOrderReqVo {
     private Long templateId;
     @NotNull
     private String data;
+    @NotBlank
+    private String orderName;
 
     @Override
     public String toString() {
         return "CreateOrderReqVo{" +
                 "templateId=" + templateId +
                 ", data='" + data + '\'' +
+                ", orderName='" + orderName + '\'' +
                 '}';
     }
 
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
     public Long getTemplateId() {
         return templateId;
     }

+ 1 - 1
src/main/java/cn/iaun/it/model/vo/itsm/controller/GetOrderVo.java → src/main/java/cn/iaun/it/model/vo/itsm/controller/GetOrderReqVo.java

@@ -2,7 +2,7 @@ package cn.iaun.it.model.vo.itsm.controller;
 
 import javax.validation.constraints.NotNull;
 
-public class GetOrderVo {
+public class GetOrderReqVo {
     private Integer pageNo;
     private Integer pageSize;
     @NotNull

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

@@ -4,7 +4,8 @@ import cn.iaun.it.model.ItItsmLog;
 import cn.iaun.it.model.ItItsmOrder;
 import cn.iaun.it.model.ItItsmTemplate;
 import cn.iaun.it.model.ItItsmTemplateField;
-import cn.iaun.it.model.vo.itsm.controller.TemplateVo;
+import cn.iaun.it.model.vo.itsm.OrderVo;
+import cn.iaun.it.model.vo.itsm.TemplateVo;
 import cn.iaun.it.model.vo.user.ItUserVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -38,7 +39,9 @@ public interface ItItsmService {
     Boolean checkTemplateExists(Long templateId);
 
     // 流程工单
-    IPage<ItItsmOrder> getItsmOrderByIds(Integer pageNo, Integer pageSize, Long userId, Integer orderStatus);
+    IPage<ItItsmOrder> getItsmOrderByStatus(Integer pageNo, Integer pageSize, Long userId, Integer orderStatus);
+
+    IPage<OrderVo> getItsmOrderByStatusExt(Integer pageNo, Integer pageSize, Long userId, Integer orderStatus);
 
     int addItsmOrder(ItItsmOrder itItsmOrder);
 
@@ -48,6 +51,8 @@ public interface ItItsmService {
 
     ItItsmOrder getOrderByOrderId(Long orderId);
 
+    OrderVo getOrderByOrderIdExt(Long orderId, Long userId);
+
     IPage<ItItsmOrder> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed);
 
     // 流程日志

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

@@ -5,7 +5,8 @@ import cn.iaun.it.model.ItItsmLog;
 import cn.iaun.it.model.ItItsmOrder;
 import cn.iaun.it.model.ItItsmTemplate;
 import cn.iaun.it.model.ItItsmTemplateField;
-import cn.iaun.it.model.vo.itsm.controller.TemplateVo;
+import cn.iaun.it.model.vo.itsm.OrderVo;
+import cn.iaun.it.model.vo.itsm.TemplateVo;
 import cn.iaun.it.model.vo.user.ItUserVo;
 import cn.iaun.it.service.ItItsmService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -96,7 +97,7 @@ public class ItItsmServiceImpl implements ItItsmService {
     }
 
     @Override
-    public IPage<ItItsmOrder> getItsmOrderByIds(Integer pageNo, Integer pageSize, Long userId, Integer orderStatus) {
+    public IPage<ItItsmOrder> getItsmOrderByStatus(Integer pageNo, Integer pageSize, Long userId, Integer orderStatus) {
         Page<ItItsmOrder> page = new Page<>(pageNo, pageSize);
         QueryWrapper<ItItsmOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
@@ -104,6 +105,12 @@ public class ItItsmServiceImpl implements ItItsmService {
         return itItsmOrderMapper.selectPage(page, queryWrapper);
     }
 
+    @Override
+    public IPage<OrderVo> getItsmOrderByStatusExt(Integer pageNo, Integer pageSize, Long userId, Integer orderStatus) {
+        Page<OrderVo> page = new Page<>(pageNo, pageSize);
+        return itItsmOrderMapper.getOrderByStatusExt(page, userId, orderStatus);
+    }
+
     @Override
     public int addItsmOrder(ItItsmOrder itItsmOrder) {
         return itItsmOrderMapper.insert(itItsmOrder);
@@ -124,6 +131,11 @@ public class ItItsmServiceImpl implements ItItsmService {
         return itItsmOrderMapper.getOrderById(orderId);
     }
 
+    @Override
+    public OrderVo getOrderByOrderIdExt(Long orderId, Long userId) {
+        return itItsmOrderMapper.getOrderByIdExt(orderId, userId);
+    }
+
     @Override
     public IPage<ItItsmOrder> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed) {
         Page<ItItsmOrder> page = new Page<>(pageNo, pageSize);

+ 11 - 9
src/main/resources/db/schema.sql

@@ -218,15 +218,17 @@ CREATE TABLE `it_itsm_log`
 drop TABLE if exists `it_itsm_order`;
 CREATE TABLE `it_itsm_order`
 (
-    `order_id`        BIGINT(19) NOT NULL AUTO_INCREMENT,
-    `template_id`     BIGINT(19) NOT NULL,
-    `user_id`         BIGINT(19) NOT NULL,
-    `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,
+    `order_id`        BIGINT(19)   NOT NULL AUTO_INCREMENT,
+    `order_name`      VARCHAR(255) NOT NULL,
+    `template_id`     BIGINT(19)   NOT NULL,
+    `user_id`         BIGINT(19)   NOT NULL,
+    `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,
+    `create_time`     TIMESTAMP    NOT NULL,
     PRIMARY KEY (`order_id`)
 ) COMMENT ='工单'
 ;

+ 46 - 2
src/main/resources/mapper/ItItsmOrderMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="getOrderById" resultType="cn.iaun.it.model.ItItsmOrder">
         select `order_id`,
+               `order_name`,
                `template_id`,
                `user_id`,
                `current_user_id`,
@@ -11,12 +12,14 @@
                `order_status`,
                `reply`,
                `evaluate`,
-               `comment`
+               `comment`,
+               `create_time`
         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`,
@@ -24,7 +27,8 @@
         `order_status`,
         `reply`,
         `evaluate`,
-        `comment`
+        `comment`,
+        `create_time`
         from it_itsm_order where
         <if test="processed">
             `order_status` = 0
@@ -35,4 +39,44 @@
         </if>
         order by `order_id` desc
     </select>
+    <select id="getOrderByIdExt" 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`.`data`            as `data`,
+               `iio`.`order_status`    as `order_status`,
+               `iio`.`reply`           as `reply`,
+               `iio`.`evaluate`        as `evaluate`,
+               `iio`.`comment`         as `comment`,
+               `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 (`iio`.`order_id` = #{orderId} AND
+               (iio.`user_id` = #{userId} OR iio.`current_user_id` = #{userId} OR
+                iio.`order_id` IN
+                (SELECT DISTINCT iil.`order_id`
+                 FROM `it_itsm_log` iil
+                 WHERE `iil`.`user_id` = #{userId})))
+    </select>
+    <select id="getOrderByStatusExt" 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 `iio`.`user_id` = #{userId}
+          and `iio`.`order_status` = #{orderStatus}
+    </select>
 </mapper>

+ 1 - 1
src/main/resources/mapper/ItItsmTemplateMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iaun.it.mapper.ItItsmTemplateMapper">
 
-    <select id="getAllTemplatesWithUserName" resultType="cn.iaun.it.model.vo.itsm.controller.TemplateVo">
+    <select id="getAllTemplatesWithUserName" resultType="cn.iaun.it.model.vo.itsm.TemplateVo">
         SELECT `iit`.`template_id`   as `template_id`,
                `iit`.`name`          as name,
                `iit`.`template_user` as `template_user`,