56486

whywhyo

2023-08-01 627a31505ddd81c542a9a2c4b8ed114eee176a54

56486

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java

@@ -61,7 +61,7 @@
    /**
     * 模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getModel(HttpServletResponse response){
        ZHonor zHonor = new ZHonor();
        List<ZHonor> emptyList = Collections.singletonList(zHonor);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java

@@ -60,7 +60,7 @@
    /**
     * 模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getModel(HttpServletResponse response){
        ZIdea zIdea = new ZIdea();
        List<ZIdea> emptyList = Collections.singletonList(zIdea);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java

@@ -60,7 +60,7 @@
    /**
     * 模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getModel(HttpServletResponse response){
        ZProperty zProperty = new ZProperty();
        List<ZProperty> emptyList = Collections.singletonList(zProperty);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java

@@ -59,7 +59,7 @@
    /**
     * 模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getModel(HttpServletResponse response){
        ZSecret zSecret = new ZSecret();
        List<ZSecret> emptyList = Collections.singletonList(zSecret);

 ruoyi-admin/src/main/resources/application.yml

@@ -59,9 +59,9 @@
  servlet:
     multipart:
       # 单个文件大小
       max-file-size:  10MB
       max-file-size:  1000MB
       # 设置总上传的文件大小
       max-request-size:  20MB
       max-request-size:  2000MB
  # 服务模块
  devtools:
    restart:

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -25,12 +25,12 @@
    /**
     * 默认大小 50M
     */
    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
    public static final long DEFAULT_MAX_SIZE = 1024 * 1024 * 1024;

    /**
     * 默认的文件名最大长度 100
     */
    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
    public static final int DEFAULT_FILE_NAME_LENGTH = 500;

    /**
     * 默认上传的地址

 zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java

@@ -60,6 +60,7 @@
                .like(StringUtils.isNotEmpty(zProperty.getType()), ZProperty::getType, zProperty.getType())
                .like(StringUtils.isNotEmpty(zProperty.getIncomeName()), ZProperty::getIncomeName, zProperty.getIncomeName())
                .eq(zProperty.getIsChange()!=null,ZProperty::getIsChange,zProperty.getIsChange())
                .like(StringUtils.isNotEmpty(zProperty.getTimeLimit()),ZProperty::getTimeLimit,zProperty.getTimeLimit())
                .between(zProperty.getHappenStartTime() != null && zProperty.getHappenEndTime() != null, ZProperty::getHappenTime, zProperty.getHappenStartTime(), zProperty.getHappenEndTime())
                .orderByDesc(ZProperty::getCreateTime);
        return lqw;

 zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java

@@ -54,6 +54,8 @@
        lqw.eq(userId != null, ZSelfNote::getUid, userId)
                .like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
                .like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
                .like(StringUtils.isNotEmpty(zSelfNote.getAddress()),ZSelfNote::getAddress,zSelfNote.getAddress())
                .like(StringUtils.isNotEmpty(zSelfNote.getRemark()),ZSelfNote::getRemark,zSelfNote.getRemark())
                .between(zSelfNote.getHappenStartTime() != null && zSelfNote.getHappenEndTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenStartTime(), zSelfNote.getHappenEndTime())
                .orderByDesc(ZSelfNote::getCreateTime);
        return lqw;

 zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java

@@ -125,6 +125,11 @@
                .between(zTravelBase.getHappenStartTime()!=null && zTravelBase.getHappenEndTime()!=null,ZTravelBase::getHappenTime,zTravelBase.getHappenStartTime(),zTravelBase.getHappenEndTime())
                .like(StringUtils.isNotEmpty(zTravelBase.getAddress()),ZTravelBase::getAddress,zTravelBase.getAddress())
                .like(StringUtils.isNotEmpty(zTravelBase.getPeople()),ZTravelBase::getPeople,zTravelBase.getPeople())
                .eq(zTravelBase.getTotalPrice()!=null,ZTravelBase::getTotalPrice,zTravelBase.getTotalPrice())
                .like(StringUtils.isNotEmpty(zTravelBase.getTravelPeriod()),ZTravelBase::getTravelPeriod,zTravelBase.getTravelPeriod())
                .like(StringUtils.isNotEmpty(zTravelBase.getCertificate()),ZTravelBase::getCertificate,zTravelBase.getCertificate())
                .eq(zTravelBase.getSelf()!=null,ZTravelBase::getSelf,zTravelBase.getSelf())
                .like(StringUtils.isNotEmpty(zTravelBase.getRemark()),ZTravelBase::getRemark,zTravelBase.getRemark())
                .like(StringUtils.isNotEmpty(zTravelBase.getTitle()),ZTravelBase::getTitle,zTravelBase.getTitle());
        lqw.orderByDesc(ZTravelBase::getCreateTime);
        return lqw;

 zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java

@@ -68,8 +68,14 @@
        LambdaQueryWrapper<ZTravelPrice> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZTravelPrice::getMyId, userId)
                .eq(zTravelPrice.getTotalDay() != null, ZTravelPrice::getTotalDay, zTravelPrice.getTotalDay())
                .like(StringUtils.isNotEmpty(zTravelPrice.getTitle()),ZTravelPrice::getTitle,zTravelPrice.getTitle())
                .eq(zTravelPrice.getTotalCost()!=null,ZTravelPrice::getTotalCost,zTravelPrice.getTotalCost())
                .le(zTravelPrice.getEnd() != null, ZTravelPrice::getEndTime, zTravelPrice.getEnd())
                .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart());
                .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart())
                .eq(zTravelPrice.getEat()!=null,ZTravelPrice::getEat,zTravelPrice.getEat())
                .eq(zTravelPrice.getStay()!=null,ZTravelPrice::getStay,zTravelPrice.getStay())
                .eq(zTravelPrice.getTraffic()!=null,ZTravelPrice::getTraffic,zTravelPrice.getTraffic())
                .eq(zTravelPrice.getShopping()!=null,ZTravelPrice::getShopping,zTravelPrice.getShopping());

        lqw.orderBy(true, true, ZTravelPrice::getStartTime);
        return lqw;

 zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java

@@ -56,6 +56,7 @@
                .like(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
                .like(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital())
                .like(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle())
                .like(StringUtils.isNotEmpty(zYearInfo.getNotice()),ZYearInfo::getNotice,zYearInfo.getNotice())
                .between(zYearInfo.getHappenStartTime() != null && zYearInfo.getHappenEndTime() != null, ZYearInfo::getCheckTime, zYearInfo.getHappenStartTime(), zYearInfo.getHappenEndTime())
                .orderByDesc(ZYearInfo::getCreateTime);
        return lqw;