优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkHolidayMapper.java

@@ -19,5 +19,5 @@ public interface WorkHolidayMapper extends BaseMapper<WorkHoliday> {
 
     List<WorkHoliday> getByDate(@Param("startDay") Date startDay,@Param("endDay") Date endDay);
 
-    List<WorkHoliday> getByTypeAndStartDate( Date date);
+    List<WorkHoliday> getByTypeAndStartDate();
 }

wisenergy-mapper/src/main/resources/mapper/WorkHolidayMapper.xml

@@ -30,7 +30,7 @@
     <select id="getByTypeAndStartDate" resultType="cn.wisenergy.model.app.WorkHoliday">
         SELECT <include refid="Base_Column_List"/>
         FROM <include refid="table"/>
-        WHERE year(day_start) = year(#{date}) OR year(day_end) = year(#{date})
+
         ORDER BY day_type desc,day_start asc
     </select>
 

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkHolidayServiceImpl.java

@@ -77,7 +77,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
     private Boolean addHoliday(WorkHoliday workHoliday) {
         log.info("WorkHolidayServiceImpl[]addHoliday[]input.param.workHoliday:{}" + workHoliday);
         verificationDate(workHoliday);
-        List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate( new Date());
+        List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate();
         if (!CollectionUtils.isEmpty(holidays)) {
             for (WorkHoliday holiday : holidays) {
                 if (workHoliday.getDes().equals(holiday.getDes())) {
@@ -106,7 +106,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
             if (null == workHoliday.getId()) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
             }
-            List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate( new Date());
+            List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate( );
             if (!CollectionUtils.isEmpty(holidays)) {
                 for (WorkHoliday holiday : holidays) {
                     if (holiday.getId().equals(workHoliday.getId())) {
@@ -151,7 +151,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
         HolidayAndAutoDto holidayAndAutoDto = new HolidayAndAutoDto();
-        List<WorkHoliday> workHolidays = workHolidayMapper.getByTypeAndStartDate(new Date());
+        List<WorkHoliday> workHolidays = workHolidayMapper.getByTypeAndStartDate();
         WorkSubmitAdopt submitAdopt = workSubmitAdoptService.getById(1);
         holidayAndAutoDto.setWorkHolidays(workHolidays).setWorkSubmitAdopt(submitAdopt);
         List<WorkType> workTypes = workTypeService.getAll(null);