添加areaName workDays 属性

zs-manager/src/main/java/com/ruoyi/zhushi/entity/AppDTO.java

@@ -24,7 +24,7 @@ public class AppDTO extends BaseEntity {
     private String description;
 
     // 工作日
-    private List<String> workDays;
+    private String workDays;
 
 //    private List<String> workDaysList;
 
@@ -79,4 +79,7 @@ public class AppDTO extends BaseEntity {
     private String week;
 
     private int day;
+
+    private String areaName;
+
 }

zs-manager/src/main/resources/mapper/DkAttendanceGroupMapper.xml

@@ -13,6 +13,8 @@
         <result property="lng" column="lng"/>
         <result property="lat" column="lat"/>
         <result property="radius" column="radius"/>
+        <result property="areaName" column="areaName"/>
+        <result property="workDays" column="workDays"/>
     </resultMap>
 
     <select id="queryAttendanceGroupBYUserId" resultMap="DkAttendanceGroupRusult">
@@ -23,7 +25,9 @@
                         t.early_range earlyRange,
                         t.allow_late allowLate,
                         t.late_range lateRange,
-                        c.lng lng, c.lat lat, c.radius
+                        c.lng lng, c.lat lat, c.radius,
+                        c.`name` areaName,
+                        t.work_days workDays
         from dk_check_in_attendance_team_and_user u
         LEFT JOIN dk_check_in_attendance_team t on t.id = u.attendance_team_id
         left JOIN dk_check_in_config c on c.id = t.area_id