优化

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

@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -10,7 +10,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java

@@ -77,7 +77,7 @@ public class WxMyController extends BaseController {
     /**
      * 查询我的测评
      */
-    @GetMapping("/evaluation/Personal/pageList")
+    @GetMapping("/evaluation/personal/pageList")
     public TableDataInfo<SysEvaluationRecordVo> personalList(PageQuery pageQuery) {
         return myService.queryPersonalEvaluationRecordPageList(pageQuery);
     }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java

@@ -89,7 +89,7 @@ public class SysScaleBo extends BaseEntity {
     private Long cover;
     @NotNull(message = "移动端封面不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long appCover;
-    @NotNull(message = "移动端详情图不能为空", groups = {AddGroup.class, EditGroup.class})
+    //@NotNull(message = "移动端详情图不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long detailAnnex;
 
     /**

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java

@@ -21,7 +21,7 @@ public interface ReservationDayMapper extends BaseMapperPlus<ReservationDay, Res
 
     List<ReservationDateVo> selectUseDateList(@Param("time") String time, @Param("userId") Long userId);
 
-    List<ReservationDateVo> selectNotUseDateList(@Param("time") String time, @Param("userId") Long userId);
+    List<ReservationDateVo> selectNotUseDateList(@Param("time") String time,@Param("day") String day, @Param("userId") Long userId);
 
     List<ReservationOrderListVo> selectOrderList(@Param("time") String time, @Param("userId") Long userId);
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java

@@ -88,6 +88,7 @@ public class MyServiceImpl implements IMyService {
         lqw.eq(SysEvaluationRecord::getUserId, userId);
         //根据flag查询个人或发布
         lqw.eq(SysEvaluationRecord::getPublishFlag, 0);
+        //lqw.gt(SysEvaluationRecord::getStatus, -1);
         lqw.orderByDesc(SysEvaluationRecord::getCreateTime);
         return queryEvaluationRecordPageList(lqw, pageQuery);
     }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java

@@ -98,7 +98,8 @@ public class ReservationServiceImpl implements IReservationService {
 
     @Override
     public List<ReservationDateVo> selectNotUseDateList(String time, Long counselorId) {
-        return dayMapper.selectNotUseDateList(time, counselorId);
+        String day = DateUtils.getDate();
+        return dayMapper.selectNotUseDateList(time, day, counselorId);
     }
 
     @Override

ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml

@@ -25,6 +25,7 @@
                             group by day_id) t on t.day_id = rd.id
         where rd.counselor_id = #{userId}
           and DATE_FORMAT(rd.day_time, '%Y-%m') = #{time}
+          and DATE_FORMAT(rd.day_time, '%Y-%m-%d') >= #{day}
     </select>
 
     <select id="selectOrderList" resultType="org.dromara.scale.domain.vo.ReservationOrderListVo">