对接调整

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsJobCardController.java

@@ -6,6 +6,7 @@ import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
 import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.StringUtils;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsJobCard;
 import com.ktg.iscs.domain.vo.card.IsJobCardInfoRespVO;
@@ -50,6 +51,9 @@ public class IsJobCardController extends BaseController
     public CommonResult<Page<IsJobCard>> getIsJobCardPage(Page<IsJobCard> page, IsJobCard isJobCard)
     {
         Page<IsJobCard> result = isJobCardService.page(page, Wrappers.<IsJobCard>lambdaQuery()
+                .like(StringUtils.isNotBlank(isJobCard.getCardCode()), IsJobCard::getCardCode, isJobCard.getCardCode())
+                .eq(isJobCard.getCardType() != null, IsJobCard::getCardType, isJobCard.getCardType())
+                .eq(isJobCard.getUserName() != null, IsJobCard::getUserName, isJobCard.getUserName())
                 .orderByDesc(IsJobCard::getCardId));
         return CommonResult.success(result);
     }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/materialsLoan/MaterialsLoanPageVO.java

@@ -55,19 +55,23 @@ public class MaterialsLoanPageVO extends BaseBean
     private String loanFromName;
 
     @ApiModelProperty(value = "领取时间")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "领取时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "领取时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date loanTime;
 
     @ApiModelProperty(value = "提醒时间")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date reminderTime;
 
     @ApiModelProperty(value = "归还人ID")
     @Excel(name = "归还人ID")
     private Long restitutionUserId;
 
+    @ApiModelProperty(value = "归还人Name")
+    @Excel(name = "归还人Name")
+    private String restitutionUserName;
+
     @ApiModelProperty(value = "归还柜ID")
     @Excel(name = "归还柜ID")
     private Long restitutionToId;
@@ -76,18 +80,18 @@ public class MaterialsLoanPageVO extends BaseBean
     private String restitutionToName;
 
     @ApiModelProperty(value = "理应归还时间")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date restitutionTime;
 
     @ApiModelProperty(value = "实际归还时间")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "实际归还时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "实际归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date actualRestitutionTime;
 
     @ApiModelProperty(value = "超时报警")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "超时报警", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "超时报警", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date timeoutAlarm;
 
     @ApiModelProperty(value = "是否需要归还")

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

@@ -135,13 +135,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             m.materials_name,
             c1.cabinet_name as loan_from_name,
             c2.cabinet_name as restitution_to_name,
-            u.user_name as loan_user_name
+            u.user_name as loan_user_name,
+            u1.user_name as restitution_user_name
         FROM
             is_materials_loan l
         LEFT JOIN is_materials m ON m.materials_id = l.materials_id
         LEFT JOIN is_materials_cabinet c1 ON c1.cabinet_id = l.loan_from_id
         LEFT JOIN is_materials_cabinet c2 ON c2.cabinet_id = l.restitution_to_id
         LEFT JOIN sys_user u ON u.user_id = l.loan_user_id
+        LEFT JOIN sys_user u1 ON u1.user_id = l.restitution_user_id
         <where>
             <if test="dto.materialsCode != null and dto.materialsCode.trim != ''">
                 and m.materials_code like concat('%',#{dto.materialsCode},'%')