Просмотр исходного кода

20230923~20230924-细节修改&bug修复

iaun 3 лет назад
Родитель
Сommit
8aac023fd7

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

@@ -34,6 +34,12 @@ public class ItItsmController {
         return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmTemplate());
         return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmTemplate());
     }
     }
 
 
+    @PostMapping("/template/get-by-id/{id}")
+    public Result<TemplateVo> getItsmTemplateById(@PathVariable String id) {
+        Long templateId = Long.parseLong(id);
+        return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmTemplateById(templateId));
+    }
+
     @PostMapping("/admin/template/add")
     @PostMapping("/admin/template/add")
     public Result<?> addItsmTemplate(@Validated @RequestBody ItItsmTemplate itItsmTemplate) {
     public Result<?> addItsmTemplate(@Validated @RequestBody ItItsmTemplate itItsmTemplate) {
         itItsmTemplate.setTemplateId(null);
         itItsmTemplate.setTemplateId(null);
@@ -122,6 +128,14 @@ public class ItItsmController {
         itItsmOrder.setOrderName(reqVo.getOrderName());
         itItsmOrder.setOrderName(reqVo.getOrderName());
         itItsmOrder.setCreateTime(new Date());
         itItsmOrder.setCreateTime(new Date());
         int result = itItsmService.addItsmOrder(itItsmOrder);
         int result = itItsmService.addItsmOrder(itItsmOrder);
+
+        ItItsmLog log = new ItItsmLog();
+        log.setOrderId(itItsmOrder.getOrderId());
+        log.setUserId(userId);
+        log.setTime(new Date());
+        log.setLog("创建了工单:" + reqVo.getOrderName());
+
+        itItsmService.addItsmLog(log);
         return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, itItsmOrder.getOrderId());
         return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, itItsmOrder.getOrderId());
     }
     }
 
 
@@ -149,7 +163,9 @@ public class ItItsmController {
         log.setOrderId(submitOrderReqVo.getOrderId());
         log.setOrderId(submitOrderReqVo.getOrderId());
         log.setUserId(userId);
         log.setUserId(userId);
         log.setTime(new Date());
         log.setTime(new Date());
-
+        if (submitOrderReqVo.getSubmitType() == null) {
+            return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+        }
         switch (submitOrderReqVo.getSubmitType()) {
         switch (submitOrderReqVo.getSubmitType()) {
             case 0:
             case 0:
             case 1:
             case 1:
@@ -159,9 +175,9 @@ public class ItItsmController {
                 break;
                 break;
             case 2:
             case 2:
             case 3:
             case 3:
-                if (roleId != 1) {
-                    return new Result<>(ResultCode.PERM_NO_PERMISSION);
-                }
+//                if (roleId != 1) {
+//                    return new Result<>(ResultCode.PERM_NO_PERMISSION);
+//                }
                 break;
                 break;
         }
         }
 
 
@@ -170,6 +186,9 @@ public class ItItsmController {
                 if (submitOrderReqVo.getReply() == null || submitOrderReqVo.getRemark() == null) {
                 if (submitOrderReqVo.getReply() == null || submitOrderReqVo.getRemark() == null) {
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                 } else {
                 } else {
+                    if (dbData.getOrderStatus() != 0) {
+                        return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
+                    }
                     updateData.setOrderStatus(1);
                     updateData.setOrderStatus(1);
                     updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
                     updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
                     updateData.setReply(submitOrderReqVo.getReply());
                     updateData.setReply(submitOrderReqVo.getReply());
@@ -185,6 +204,9 @@ public class ItItsmController {
                 if (submitOrderReqVo.getRemark() == null) {
                 if (submitOrderReqVo.getRemark() == null) {
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                 } else {
                 } else {
+                    if (dbData.getOrderStatus() != 0) {
+                        return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
+                    }
                     updateData.setOrderStatus(2);
                     updateData.setOrderStatus(2);
                     updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
                     updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
 
 
@@ -199,6 +221,9 @@ public class ItItsmController {
                 if (submitOrderReqVo.getEvaluate() == null || submitOrderReqVo.getComment() == null) {
                 if (submitOrderReqVo.getEvaluate() == null || submitOrderReqVo.getComment() == null) {
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                 } else {
                 } else {
+                    if (dbData.getOrderStatus() != 1) {
+                        return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
+                    }
                     updateData.setEvaluate(submitOrderReqVo.getEvaluate());
                     updateData.setEvaluate(submitOrderReqVo.getEvaluate());
                     updateData.setComment(submitOrderReqVo.getComment());
                     updateData.setComment(submitOrderReqVo.getComment());
                     updateData.setOrderStatus(3);
                     updateData.setOrderStatus(3);
@@ -209,6 +234,9 @@ public class ItItsmController {
                 if (submitOrderReqVo.getData() == null) {
                 if (submitOrderReqVo.getData() == null) {
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                     return new Result<>(ResultCode.FAILED_PARAM_INVALID);
                 } else {
                 } else {
+                    if (dbData.getOrderStatus() != 2) {
+                        return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
+                    }
                     ItItsmTemplate template = itItsmService.getItsmTemplateByTemplateId(dbData.getTemplateId());
                     ItItsmTemplate template = itItsmService.getItsmTemplateByTemplateId(dbData.getTemplateId());
                     updateData.setCurrentUserId(template.getTemplateUser());
                     updateData.setCurrentUserId(template.getTemplateUser());
                     updateData.setData(submitOrderReqVo.getData());
                     updateData.setData(submitOrderReqVo.getData());

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

@@ -8,4 +8,6 @@ import java.util.List;
 
 
 public interface ItItsmTemplateMapper extends BaseMapper<ItItsmTemplate> {
 public interface ItItsmTemplateMapper extends BaseMapper<ItItsmTemplate> {
     List<TemplateVo> getAllTemplatesWithUserName();
     List<TemplateVo> getAllTemplatesWithUserName();
+
+    TemplateVo getTemplatesWithUserNameById(Long templateId);
 }
 }

+ 11 - 1
src/main/java/cn/iaun/it/model/vo/user/ItUserInfoVo.java

@@ -5,6 +5,7 @@ import cn.iaun.it.model.vo.permission.ItRoleSysPermissionVo;
 import java.util.List;
 import java.util.List;
 
 
 public class ItUserInfoVo {
 public class ItUserInfoVo {
+    private Long userId;
     private String user;
     private String user;
     private String displayName;
     private String displayName;
     private String phoneNumber;
     private String phoneNumber;
@@ -15,7 +16,8 @@ public class ItUserInfoVo {
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "ItUserInfoVo{" +
         return "ItUserInfoVo{" +
-                "user='" + user + '\'' +
+                "userId=" + userId +
+                ", user='" + user + '\'' +
                 ", displayName='" + displayName + '\'' +
                 ", displayName='" + displayName + '\'' +
                 ", phoneNumber='" + phoneNumber + '\'' +
                 ", phoneNumber='" + phoneNumber + '\'' +
                 ", roleId=" + roleId +
                 ", roleId=" + roleId +
@@ -24,6 +26,14 @@ public class ItUserInfoVo {
                 '}';
                 '}';
     }
     }
 
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public List<ItRoleSysPermissionVo> getPermissions() {
     public List<ItRoleSysPermissionVo> getPermissions() {
         return permissions;
         return permissions;
     }
     }

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

@@ -15,6 +15,8 @@ public interface ItItsmService {
     // 流程模板
     // 流程模板
     List<TemplateVo> getItsmTemplate();
     List<TemplateVo> getItsmTemplate();
 
 
+    TemplateVo getItsmTemplateById(Long templateId);
+
     int addItsmTemplate(ItItsmTemplate itItsmTemplate);
     int addItsmTemplate(ItItsmTemplate itItsmTemplate);
 
 
     int delItsmTemplate(Long templateId);
     int delItsmTemplate(Long templateId);

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

@@ -37,6 +37,11 @@ public class ItItsmServiceImpl implements ItItsmService {
         return itItsmTemplateMapper.getAllTemplatesWithUserName();
         return itItsmTemplateMapper.getAllTemplatesWithUserName();
     }
     }
 
 
+    @Override
+    public TemplateVo getItsmTemplateById(Long templateId) {
+        return itItsmTemplateMapper.getTemplatesWithUserNameById(templateId);
+    }
+
     @Override
     @Override
     public int addItsmTemplate(ItItsmTemplate itItsmTemplate) {
     public int addItsmTemplate(ItItsmTemplate itItsmTemplate) {
         return itItsmTemplateMapper.insert(itItsmTemplate);
         return itItsmTemplateMapper.insert(itItsmTemplate);

+ 1 - 0
src/main/java/cn/iaun/it/util/ResultCode.java

@@ -6,6 +6,7 @@ public enum ResultCode {
     FAILED_PARAM_ERROR(1001, "参数错误!"),
     FAILED_PARAM_ERROR(1001, "参数错误!"),
     FAILED_PARAM_INVALID(1002, "参数无效!"), // 如ID不存在等
     FAILED_PARAM_INVALID(1002, "参数无效!"), // 如ID不存在等
     FAILED_PARAM_FORMAT(1003, "参数格式错误!"),
     FAILED_PARAM_FORMAT(1003, "参数格式错误!"),
+    OPERATION_NOT_PERMITTED(1004, "操作不允许!"),
 
 
     /* 用户模块 1001XXX */
     /* 用户模块 1001XXX */
     USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误"),
     USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误"),

+ 5 - 3
src/main/resources/mapper/ItItsmOrderMapper.xml

@@ -19,7 +19,7 @@
     </select>
     </select>
     <select id="adminGetOrder" resultType="cn.iaun.it.model.ItItsmOrder">
     <select id="adminGetOrder" resultType="cn.iaun.it.model.ItItsmOrder">
         select `order_id`,
         select `order_id`,
-               `order_name`,
+        `order_name`,
         `template_id`,
         `template_id`,
         `user_id`,
         `user_id`,
         `current_user_id`,
         `current_user_id`,
@@ -32,12 +32,13 @@
         from it_itsm_order where
         from it_itsm_order where
         <if test="processed">
         <if test="processed">
             `order_status` = 0
             `order_status` = 0
-            and `order_id` IN (select distinct `il`.`order_id` from `it_itsm_log` `il` where `il`.`user_id` = #{user_id})
+            and `order_id` IN (select distinct `il`.`order_id` from `it_itsm_log` `il` where `il`.`user_id` =
+            #{user_id})
         </if>
         </if>
         <if test="!processed">
         <if test="!processed">
             `current_user_id` = #{userId}
             `current_user_id` = #{userId}
         </if>
         </if>
-        order by `order_id` desc
+        order by `create_time` desc
     </select>
     </select>
     <select id="getOrderByIdExt" resultType="cn.iaun.it.model.vo.itsm.OrderVo">
     <select id="getOrderByIdExt" resultType="cn.iaun.it.model.vo.itsm.OrderVo">
         select `iio`.`order_id`        as `order_id`,
         select `iio`.`order_id`        as `order_id`,
@@ -78,5 +79,6 @@
                  LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
                  LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
         where `iio`.`user_id` = #{userId}
         where `iio`.`user_id` = #{userId}
           and `iio`.`order_status` = #{orderStatus}
           and `iio`.`order_status` = #{orderStatus}
+        order by `create_time` desc
     </select>
     </select>
 </mapper>
 </mapper>

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

@@ -12,4 +12,15 @@
                  LEFT JOIN `it_user` `iu` ON `iit`.`template_user` = `iu`.`user_id`
                  LEFT JOIN `it_user` `iu` ON `iit`.`template_user` = `iu`.`user_id`
         order by `iit`.template_id desc
         order by `iit`.template_id desc
     </select>
     </select>
+    <select id="getTemplatesWithUserNameById" 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`,
+               `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`
+        where `template_id` = #{templateId}
+        order by `iit`.template_id desc
+    </select>
 </mapper>
 </mapper>

+ 2 - 1
src/main/resources/mapper/ItUserMapper.xml

@@ -8,7 +8,8 @@
         where u.user = #{user} and u.password = #{password} limit 1
         where u.user = #{user} and u.password = #{password} limit 1
     </select>
     </select>
     <select id="selectUserInfo" resultType="cn.iaun.it.model.vo.user.ItUserInfoVo">
     <select id="selectUserInfo" resultType="cn.iaun.it.model.vo.user.ItUserInfoVo">
-        select u.user         as user,
+        select u.user_id      as user_id,
+               u.user         as user,
                u.display_name as display_name,
                u.display_name as display_name,
                u.phone_number as phone_number,
                u.phone_number as phone_number,
                u.role_id      as role_id,
                u.role_id      as role_id,