iaun 3 лет назад
Родитель
Сommit
5af01f405c

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

@@ -4,10 +4,7 @@ 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.AdminGetOrderVo;
-import cn.iaun.it.model.vo.itsm.controller.CreateOrderReqVo;
-import cn.iaun.it.model.vo.itsm.controller.GetOrderVo;
-import cn.iaun.it.model.vo.itsm.controller.SubmitOrderReqVo;
+import cn.iaun.it.model.vo.itsm.controller.*;
 import cn.iaun.it.model.vo.user.ItUserVo;
 import cn.iaun.it.service.ItItsmService;
 import cn.iaun.it.util.MyPage;
@@ -31,7 +28,7 @@ public class ItItsmController {
     }
 
     @PostMapping("/admin/template/get")
-    public Result<List<ItItsmTemplate>> getItsmTemplate() {
+    public Result<List<TemplateVo>> getItsmTemplate() {
         return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmTemplate());
     }
 

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

@@ -1,7 +1,11 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItItsmTemplate;
+import cn.iaun.it.model.vo.itsm.controller.TemplateVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 public interface ItItsmTemplateMapper extends BaseMapper<ItItsmTemplate> {
+    List<TemplateVo> getAllTemplatesWithUserName();
 }

+ 22 - 0
src/main/java/cn/iaun/it/model/vo/itsm/controller/TemplateVo.java

@@ -0,0 +1,22 @@
+package cn.iaun.it.model.vo.itsm.controller;
+
+import cn.iaun.it.model.ItItsmTemplate;
+
+public class TemplateVo extends ItItsmTemplate {
+    private String optUserName;
+
+    @Override
+    public String toString() {
+        return "TemplateVo{" +
+                "optUserName='" + optUserName + '\'' +
+                "} " + super.toString();
+    }
+
+    public String getOptUserName() {
+        return optUserName;
+    }
+
+    public void setOptUserName(String optUserName) {
+        this.optUserName = optUserName;
+    }
+}

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

@@ -4,6 +4,7 @@ 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.user.ItUserVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -11,7 +12,7 @@ import java.util.List;
 
 public interface ItItsmService {
     // 流程模板
-    List<ItItsmTemplate> getItsmTemplate();
+    List<TemplateVo> getItsmTemplate();
 
     int addItsmTemplate(ItItsmTemplate itItsmTemplate);
 

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

@@ -5,12 +5,12 @@ 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.user.ItUserVo;
 import cn.iaun.it.service.ItItsmService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -32,10 +32,8 @@ public class ItItsmServiceImpl implements ItItsmService {
     }
 
     @Override
-    public List<ItItsmTemplate> getItsmTemplate() {
-        QueryWrapper<ItItsmTemplate> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("template_id");
-        return itItsmTemplateMapper.selectList(queryWrapper);
+    public List<TemplateVo> getItsmTemplate() {
+        return itItsmTemplateMapper.getAllTemplatesWithUserName();
     }
 
     @Override

+ 4 - 4
src/main/resources/db/schema.sql

@@ -207,7 +207,7 @@ CREATE TABLE `it_monitor_threshold`
 drop TABLE if exists `it_itsm_log`;
 CREATE TABLE `it_itsm_log`
 (
-    `log_id`   BIGINT(19) NOT NULL,
+    `log_id`   BIGINT(19) NOT NULL AUTO_INCREMENT,
     `order_id` BIGINT(19) NOT NULL,
     `user_id`  BIGINT(19) NOT NULL,
     `time`     TIMESTAMP  NOT NULL,
@@ -218,7 +218,7 @@ CREATE TABLE `it_itsm_log`
 drop TABLE if exists `it_itsm_order`;
 CREATE TABLE `it_itsm_order`
 (
-    `order_id`        BIGINT(19) NOT NULL,
+    `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,
@@ -233,7 +233,7 @@ CREATE TABLE `it_itsm_order`
 drop TABLE if exists `it_itsm_template`;
 CREATE TABLE `it_itsm_template`
 (
-    `template_id`   BIGINT(19)   NOT NULL,
+    `template_id`   BIGINT(19)   NOT NULL AUTO_INCREMENT,
     `name`          VARCHAR(255) NOT NULL,
     `template_user` BIGINT(19)   NOT NULL,
     PRIMARY KEY (`template_id`)
@@ -242,7 +242,7 @@ CREATE TABLE `it_itsm_template`
 drop TABLE if exists `it_itsm_template_field`;
 CREATE TABLE `it_itsm_template_field`
 (
-    `field_id`    BIGINT(19)   NOT NULL,
+    `field_id`    BIGINT(19)   NOT NULL AUTO_INCREMENT,
     `title`       VARCHAR(255) NOT NULL,
     `template_id` BIGINT(19)   NOT NULL,
     `required`    TINYINT(3)   NOT NULL,

+ 15 - 0
src/main/resources/mapper/ItItsmTemplateMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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 `iit`.`template_id`   as `template_id`,
+               `iit`.`name`          as name,
+               `iit`.`template_user` as `template_user`,
+               `iu`.`user`           as `user`,
+               `iu`.`display_name`   as `optUserName`
+        FROM `it_itsm_template` `iit`
+                 LEFT JOIN `it_user` `iu` ON `iit`.`template_user` = `iu`.`user_id`
+        order by `iit`.template_id desc
+    </select>
+</mapper>