对接修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialsloan/vo/MaterialsLoanPageReqVO.java

@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -60,4 +60,29 @@ public class MaterialsLoanPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-}
+    @Schema(description = "物资名称")
+    private String materialsName;
+
+    @Schema(description = "物资类型ID")
+    private Long materialsTypeId;
+
+    @Schema(description = "领取人Name")
+    private String loanUserName;
+
+    @Schema(description = "领取开始时间")
+    private String loanTimeStart;
+
+    @Schema(description = "领取结束时间")
+    private String loanTimeEnd;
+
+    @Schema(description = "归还人Name")
+    private String restitutionUserName;
+
+    @Schema(description = "归还开始时间")
+    private String restitutionTimeStart;
+
+    @Schema(description = "归还结束时间")
+    private String restitutionTimeEnd;
+
+
+}

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

@@ -12,7 +12,7 @@
     <select id="getMaterialsPropertyValuePage"
             resultType="cn.iocoder.yudao.module.iscs.controller.admin.materialspropertyvalue.vo.MaterialsPropertyValueRespVO">
         select v.*, p.property_name from isc_materials_property_value v
-        left join isc_materials_property p on v.property_id = p.property_id
+        left join isc_materials_property p on v.property_id = p.id
         <where>
             <if test="vo.valueName != null and vo.valueName.trim != ''">
                 and v.value_name like concat('%',#{vo.valueName},'%')