优化

platform-common/src/main/java/com/platform/common/util/DateUtils.java

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
+import java.time.chrono.ChronoLocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.*;
@@ -513,8 +514,22 @@ public class DateUtils {
     public static void main(String[] args) {
         Calendar calendar = Calendar.getInstance();
         System.out.println(DateUtils.dateToString(calendar.getTime()));
+
+        getNextSevenDays(LocalDate.now().minusDays(1));
+
     }
 
+    public static List<String> getNextSevenDays(LocalDate date) {
+        List<String> dateList = new ArrayList<>();
+        for (int i = 0; i < 7; i++) {
+            date = DateUtils.plus(date,1, ChronoUnit.DAYS);
+
+            dateList.add(DateUtils.dateToString(date,"yyyy-MM-dd"));
+        }
+        return dateList;
+    }
+
+
     /**
      * date 转 LocalDate
      *

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

@@ -29,7 +29,7 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     /**
      * 日历时间
      */
-    private LocalDateTime calendarDate;
+    private LocalDate calendarDate;
 
     private String deptId;
 

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -22,7 +22,7 @@ public class RepairApplicationForm implements Serializable {
     /**
      * 日历时间
      */
-    private LocalDateTime calendarDate;
+    private LocalDate calendarDate;
 
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairApplicationFormMapper.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,6 +20,7 @@ import java.util.List;
  */
 @Component
 public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationForm> {
+    Map<String,Integer> getLoginNotice(RepairApplicationFormDTO dto);
     List<FiftyFailSbReportVO> getFiftyFailSbReport(RepairApplicationFormDTO dto);
 
     String getDeptName(String id);

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -29,7 +29,7 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
     /**
      * 日历时间
      */
-    private LocalDateTime calendarDate;
+    private LocalDate calendarDate;
 
     private BigDecimal repairCount;
 

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

@@ -569,4 +569,18 @@
         </where>
         group by status
     </select>
+
+    <select id="getLoginNotice" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
+            resultType="java.util.Map">
+        select count(1),calendar_date from t_repair_application_form form
+        <where>
+            <if test="dispatchUserId!=null and dispatchUserId!=''">
+                form.dispatch_user_id = #{dispatchUserId}
+            </if>
+            <if test="repairUserId!=null and repairUserId!=''">
+                form.repair_user_id = #{repairUserId}
+            </if>
+        </where>
+        order by calendar_date
+    </select>
 </mapper>

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -33,7 +33,7 @@ import java.util.Map;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface RepairApplicationFormService extends IBaseService<RepairApplicationForm, RepairApplicationFormDTO> {
-    Map<Date,Integer> getLoginNotice();
+    Map<String,Integer> getLoginNotice();
 
     TuiCalendar getTuiCalendar(RepairApplicationFormDTO repairApplicationFormDTO);
 

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

@@ -121,9 +121,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final BigDecimal initNum= new BigDecimal(0);
 
     @Override
-    public Map<Date, Integer> getLoginNotice() {
-
-        return null;
+    public Map<String, Integer> getLoginNotice() {
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        //获取近七天的日期
+        List<String> nextDayList = DateUtils.getNextSevenDays(LocalDate.now().minusDays(1));
+        RepairApplicationFormDTO dto = new RepairApplicationFormDTO();
+        List<String> roleCodes = userInfo.getRoleCodes();
+        if (roleCodes.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
+            dto.setDispatchUserId(userInfo.getUserId());
+        }else if (roleCodes.contains(SysRoleCodeEnum.Maintenance.name())){
+            dto.setRepairUserId(userInfo.getUserId());
+        }
+        Map<String,Integer> map = mapper.getLoginNotice(dto);
+        return map;
     }
 
     @Override