wenhongquan 1 year ago
parent
commit
48bbcfc896

+ 2 - 2
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TblArchives.java

@@ -57,12 +57,12 @@ public class TblArchives extends BaseEntity {
     /**
      * 成果(建档)日期
      */
-    private Date achievementDate;
+    private String achievementDate;
 
     /**
      * 保管期限
      */
-    private Date savePeriod;
+    private String savePeriod;
 
     /**
      * 备注

+ 2 - 2
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TblArchivesBo.java

@@ -62,13 +62,13 @@ public class TblArchivesBo extends BaseEntity {
      * 成果(建档)日期
      */
     @NotNull(message = "成果(建档)日期不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date achievementDate;
+    private String achievementDate;
 
     /**
      * 保管期限
      */
     @NotNull(message = "保管期限不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date savePeriod;
+    private String savePeriod;
 
     /**
      * 备注

+ 2 - 2
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TblArchivesVo.java

@@ -73,13 +73,13 @@ public class TblArchivesVo implements Serializable {
      */
     @ExcelProperty(value = "成果", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "建=档")
-    private Date achievementDate;
+    private String achievementDate;
 
     /**
      * 保管期限
      */
     @ExcelProperty(value = "保管期限")
-    private Date savePeriod;
+    private String savePeriod;
 
     /**
      * 备注

+ 6 - 5
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/TblArchivesServiceImpl.java

@@ -62,14 +62,15 @@ public class TblArchivesServiceImpl implements ITblArchivesService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblArchives> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getArea()), TblArchives::getArea, bo.getArea());
-        lqw.eq(StringUtils.isNotBlank(bo.getQiuquan()), TblArchives::getQiuquan, bo.getQiuquan());
-        lqw.eq(StringUtils.isNotBlank(bo.getBuildUnit()), TblArchives::getBuildUnit, bo.getBuildUnit());
-        lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TblArchives::getAddr, bo.getAddr());
-        lqw.eq(StringUtils.isNotBlank(bo.getCommunity()), TblArchives::getCommunity, bo.getCommunity());
+        lqw.like(StringUtils.isNotBlank(bo.getQiuquan()), TblArchives::getQiuquan, bo.getQiuquan());
+//        lqw.eq(StringUtils.isNotBlank(bo.getQiuquan()), TblArchives::getQiuquan, bo.getQiuquan());
+        lqw.like(StringUtils.isNotBlank(bo.getBuildUnit()), TblArchives::getBuildUnit, bo.getBuildUnit());
+        lqw.like(StringUtils.isNotBlank(bo.getAddr()), TblArchives::getAddr, bo.getAddr());
+        lqw.like(StringUtils.isNotBlank(bo.getCommunity()), TblArchives::getCommunity, bo.getCommunity());
         lqw.eq(bo.getAchievementDate() != null, TblArchives::getAchievementDate, bo.getAchievementDate());
         lqw.eq(bo.getSavePeriod() != null, TblArchives::getSavePeriod, bo.getSavePeriod());
         lqw.eq(StringUtils.isNotBlank(bo.getEcode()), TblArchives::getEcode, bo.getEcode());
-        lqw.eq(StringUtils.isNotBlank(bo.getSaveAddr()), TblArchives::getSaveAddr, bo.getSaveAddr());
+        lqw.like(StringUtils.isNotBlank(bo.getSaveAddr()), TblArchives::getSaveAddr, bo.getSaveAddr());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblArchives::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblArchives::getExt2, bo.getExt2());
         return lqw;