Changes

src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java

@@ -174,7 +174,7 @@ public class AttendanceanalysisAction {
     @Produces({"text/plain"})
     public String getDefaultCalendar(@Context HttpServletRequest request, @Context HttpServletResponse response){
         try {
-            String sql = "select szjg, rlmc, rlsm from uf_jcl_kq_rlmc";
+            String sql = "select id, szjg, rlmc, rlsm from uf_jcl_kq_rlmc where mrrl = '1'";
             List<Map<String,Object>> calendarList = DbTools.getSqlToList(sql);
             return ApiReturnTools.success(calendarList);
         }catch (Exception e){
@@ -182,4 +182,21 @@ public class AttendanceanalysisAction {
             return ApiReturnTools.error("500","saveApplicableOrganization error");
         }
     }
+
+    /**
+     * 获得已经设置为默认日历的日历名称信息
+     */
+    @POST
+    @Path("/dumpDefaultCalendar")
+    @Produces({"text/plain"})
+    public String dumpDefaultCalendar(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        try {
+            String sql = "update uf_jcl_kq_rlmc set mrrl = '0'";
+            if(DbTools.update(sql))
+                return ApiReturnTools.success(Lists.newArrayList());
+        }catch (Exception e){
+            log.error("execute fail,catch error: [{}]",e);
+            return ApiReturnTools.error("500","saveApplicableOrganization error");
+        }
+    }
 }