对接修改

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/checkRecord/CheckRecordPageDTO.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.domain.dto.checkRecord;
 
-import com.ktg.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -40,7 +39,9 @@ public class CheckRecordPageDTO
     private String status;
 
     @ApiModelProperty(value = "异常原因")
-    @Excel(name = "异常原因")
     private String reason;
 
+    @ApiModelProperty(value = "物资柜ID")
+    private Long cabinetId;
+
 }

ktg-iscs/src/main/resources/mapper/IsMaterialsCheckRecordMapper.xml

@@ -27,6 +27,9 @@
             <if test="dto.planId != null">
                 and r.plan_id = #{dto.planId}
             </if>
+            <if test="dto.cabinetId != null">
+                and m.materials_cabinet_id = #{dto.cabinetId}
+            </if>
             <if test="dto.planName != null and dto.planName.trim != ''">
                 and p.plan_name like concat('%',#{dto.planName},'%')
             </if>

ktg-quartz/src/main/java/com/ktg/quartz/task/MaterialsLoanTask.java

@@ -0,0 +1,36 @@
+package com.ktg.quartz.task;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ktg.iscs.domain.IsMaterialsLoan;
+import com.ktg.iscs.service.IIsMaterialsLoanService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 定时发送检查物资柜提醒邮件
+ *
+ * @author CGJ
+ */
+@Slf4j
+@Component("materialsLoanTask")
+public class MaterialsLoanTask {
+
+    @Autowired
+    private IIsMaterialsLoanService iIsMaterialsLoanService;
+
+    /**
+     * 扫描is_materials_loan，更新借取记录的超时未归还状态
+     */
+    public void checkMaterialsLoan() {
+        // 未归还  需要归还  已经过了告警事件
+        iIsMaterialsLoanService.update(Wrappers.<IsMaterialsLoan>lambdaUpdate()
+                .eq(IsMaterialsLoan::getStatus, "0")
+                .eq(IsMaterialsLoan::getRestitutionRequired, 1)
+                .lt(IsMaterialsLoan::getTimeoutAlarm, new Date())
+                .set(IsMaterialsLoan::getStatus, "2"));
+    }
+
+}