1 жил өмнө
parent
commit
6ecef7bf53

+ 2 - 0
platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -24,6 +24,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
+    private List<String> dateList;
+
     private Boolean addCalendar;
 
     /**

+ 6 - 0
platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -586,6 +586,12 @@
             <if test="addCalendar">
                 and form.calendar_date is not null
             </if>
+            <if test="dateList!=null and dateList.size()>0">
+                and form.calendar_date in
+                <foreach collection="dateList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         group by calendar_date
         order by calendar_date asc

+ 1 - 0
platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -133,6 +133,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         }else if (roleCodes.contains(SysRoleCodeEnum.Maintenance.name())){
             dto.setRepairUserId(userInfo.getUserId());
         }
+        dto.setDateList(nextDayList);
         dto.setAddCalendar(true);
         List<NoticeVO> map = mapper.getLoginNotice(dto);
         return map;