异常部分参数修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exception/vo/ExceptionPageReqVO.java

@@ -46,6 +46,9 @@ public class ExceptionPageReqVO extends PageParam {
     @Schema(description = "状态（0-未处理 1-已处理）", example = "2")
     private String status;
 
+    @Schema(description = "人工上传（0-否 1-是）", example = "0")
+    private String isUpload;
+
     @Schema(description = "备注", example = "你说的对")
     private String remark;
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exception/vo/ExceptionRespVO.java

@@ -2,10 +2,11 @@ package cn.iocoder.yudao.module.iscs.controller.admin.exception.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Schema(description = "管理后台 - 异常记录 Response VO")
 @Data
@@ -54,7 +55,8 @@ public class ExceptionRespVO {
 
     @Schema(description = "异常发生时间")
     @ExcelProperty("异常发生时间")
-    private LocalDateTime raiseTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date raiseTime;
 
     @Schema(description = "引发人ID")
     @ExcelProperty("引发人ID")
@@ -70,7 +72,8 @@ public class ExceptionRespVO {
 
     @Schema(description = "异常处理时间")
     @ExcelProperty("异常处理时间")
-    private LocalDateTime handleTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date handleTime;
 
     @Schema(description = "状态（0-未处理 1-已处理）", example = "2")
     @ExcelProperty("状态（0-未处理 1-已处理）")
@@ -82,7 +85,8 @@ public class ExceptionRespVO {
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @Schema(description = "异常发生时间")
     private String startRaiseTime;
@@ -96,5 +100,4 @@ public class ExceptionRespVO {
     @Schema(description = "异常处理时间")
     private String endHandleTime;
 
-
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exceptionmisplace/vo/ExceptionMisplacePageReqVO.java

@@ -2,11 +2,13 @@ package cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -62,4 +64,36 @@ public class ExceptionMisplacePageReqVO extends PageParam {
     @TableField(exist = false)
     private String handleEndTime;
 
+    @Schema(description = "物资RFID")
+    private String materialsRfid;
+
+    @Schema(description = "物资name")
+    private String materialsName;
+
+    @Schema(description = "物资所属柜code")
+    private String loanFromCode;
+
+    @Schema(description = "物资所属柜")
+    private String loanFromName;
+
+    @Schema(description = "领取时间")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loanTime;
+
+    @Schema(description = "归还人")
+    private String restitutionUserName;
+
+    @Schema(description = "归还柜")
+    private String restitutionToName;
+
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "异常解决结束时间")
+    private Date actualRestitutionTime;
+
+    @Schema(description = "物资类型图标")
+    private String materialsTypeIcon;
+
+    @Schema(description = "物资类型缩略图")
+    private String materialsTypePicture;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exceptionmisplace/vo/ExceptionMisplaceRespVO.java

@@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Schema(description = "管理后台 - 物资归还异常 Response VO")
 @Data
@@ -50,11 +52,13 @@ public class ExceptionMisplaceRespVO {
 
     @Schema(description = "异常处理时间")
     @ExcelProperty("异常处理时间")
-    private LocalDateTime handleTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date handleTime;
 
     @Schema(description = "异常发生时间")
     @ExcelProperty("异常发生时间")
-    private LocalDateTime occurTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date occurTime;
 
     @Schema(description = "备注", example = "随便")
     @ExcelProperty("备注")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/exception/ExceptionDO.java

@@ -1,13 +1,12 @@
 package cn.iocoder.yudao.module.iscs.dal.dataobject.exception;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 异常记录 DO
@@ -69,10 +68,14 @@ public class ExceptionDO extends BaseDO {
      * 状态（0-未处理 1-已处理）
      */
     private String status;
+    /**
+     * 人工上传（0-否 1-是）
+     */
+    private String isUpload;
     /**
      * 备注
      */
     private String remark;
 
 
-}
+}

yudao-module-iscs/src/main/resources/mapper/ExceptionMapper.xml

@@ -44,7 +44,7 @@
         'classification_of_exceptions'
         LEFT JOIN isc_loto_station l ON l.id = e.source_id
         LEFT JOIN isc_materials_cabinet m ON m.id = e.source_id
-        LEFT JOIN system_dict_data dd ON e.exception_type = dd.value AND dd.dict_type = 'type_of_exception'
+        LEFT JOIN system_dict_data dd ON e.exception_type = dd.value AND dd.dict_type = 'exception_type'
         LEFT JOIN system_dict_data ddd ON e.exception_level = ddd.value AND ddd.dict_type = 'severity_level'
         LEFT JOIN system_users u ON u.id = e.raiser
         <where>
@@ -76,6 +76,9 @@
             <if test="vo.status != null and vo.status.trim != ''">
                 and e.status = #{vo.status}
             </if>
+            <if test="vo.isUpload != null and vo.isUpload.trim != ''">
+                and e.is_upload = #{vo.isUpload}
+            </if>
         </where>) a
         <where>
             <if test="vo.sourceName != null and vo.sourceName.trim != ''">