优化

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

@@ -575,7 +575,7 @@
 
     <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
+        select count(1) ,calendar_date from t_repair_application_form form
         <where>
             <if test="dispatchUserId!=null and dispatchUserId!=''">
                 form.dispatch_user_id = #{dispatchUserId}
@@ -584,6 +584,6 @@
                 form.repair_user_id = #{repairUserId}
             </if>
         </where>
-        order by calendar_date
+        group by calendar_date
     </select>
 </mapper>

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

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