Merge branch 'develop' into feature/dumpRestore

README.md

@@ -10,7 +10,7 @@
 
 ***
 
-# O2OA : Java企业信息化系统
+# O2OA : Java企业信息化系统,开源OA
 
 O2OA是基于J2EE架构，集成移动办公、智能办公，支持私有化部署，自适应负载能力的，能够很大程度上节约企业软件开发成本的基于AGPL协议开放源代码的企业信息化系统需求定制开发解决方案，对外提供专业的开发运维等技术服务。
 

o2android/app/build.gradle

@@ -116,6 +116,9 @@ android {
                                     BAIDU_SPEECH_APPKEY: project.baiduSpeechAppKey,
                                     BAIDU_MAP_APPKEY   : project.baiduMapAppKey,
                                     BUGLY_APPID        : project.buglyAppId]
+            zipAlignEnabled true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             signingConfig signingConfigs.release

o2android/app/proguard-rules.pro

@@ -558,3 +558,9 @@
 
 -keep class **JNI* {*;}
 
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/im/O2ChatActivity.kt

@@ -30,7 +30,7 @@ import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.im.IMConversationInfo
 class O2ChatActivity : BaseMVPActivity<O2ChatContract.View, O2ChatContract.Presenter>(), O2ChatContract.View {
 
     companion object {
-        val con_id_key = "con_id_key"
+        const val con_id_key = "con_id_key"
         fun startChat(activity: Activity, conversationId: String) {
             val bundle = Bundle()
             bundle.putString(con_id_key, conversationId)

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/DingdingAttendanceQueue.java

@@ -1,6 +1,5 @@
 package com.x.attendance.assemble.control;
 
-import com.x.attendance.assemble.control.exception.DingDingRequestException;
 import com.x.attendance.entity.AttendanceDingtalkDetail;
 import com.x.attendance.entity.AttendanceDingtalkDetail_;
 import com.x.attendance.entity.DingdingQywxSyncRecord;
@@ -113,7 +112,7 @@ public class DingdingAttendanceQueue extends AbstractQueue<DingdingQywxSyncRecor
                             }
                         } else {
                             //请求结果异常 结束
-                            throw new DingDingRequestException(result.errmsg);
+                            throw new ExceptionDingDingRequest(result.errmsg);
                         }
                     }
                 }

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ExceptionDingDingRequest.java

@@ -0,0 +1,12 @@
+package com.x.attendance.assemble.control;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionDingDingRequest extends PromptException {
+
+    private static final long serialVersionUID = -2160589718239895222L;
+
+    public ExceptionDingDingRequest(String errorMsg) {
+        super(errorMsg);
+    }
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ExceptionDingdingFindNoArgumentError.java

@@ -0,0 +1,9 @@
+package com.x.attendance.assemble.control;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionDingdingFindNoArgumentError extends PromptException {
+    public ExceptionDingdingFindNoArgumentError() {
+        super("没有传入正确的参数");
+    }
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/exception/PersonHasNoIdentityException.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ExceptionPersonHasNoIdentity.java

@@ -1,16 +1,16 @@
-package com.x.attendance.assemble.control.exception;
+package com.x.attendance.assemble.control;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class PersonHasNoIdentityException extends PromptException {
+class ExceptionPersonHasNoIdentity extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 
-	public PersonHasNoIdentityException() {
+	public ExceptionPersonHasNoIdentity() {
 		super("用户未分配任何身份，请检查用户所在的组织信息。");
 	}
 	
-	public PersonHasNoIdentityException( String name ) {
+	public ExceptionPersonHasNoIdentity(String name ) {
 		super("用户'"+ name +"'未分配任何身份，请检查用户所在的组织信息。");
 	}
 }

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ExceptionQywxFindNoArgumentError.java

@@ -0,0 +1,9 @@
+package com.x.attendance.assemble.control;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionQywxFindNoArgumentError extends PromptException {
+    public ExceptionQywxFindNoArgumentError() {
+        super("没有传入正确的参数");
+    }
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/QywxAttendanceSyncQueue.java

@@ -1,6 +1,5 @@
 package com.x.attendance.assemble.control;
 
-import com.x.attendance.assemble.control.exception.DingDingRequestException;
 import com.x.attendance.entity.AttendanceQywxDetail;
 import com.x.attendance.entity.AttendanceQywxDetail_;
 import com.x.attendance.entity.DingdingQywxSyncRecord;
@@ -93,7 +92,7 @@ public class QywxAttendanceSyncQueue  extends AbstractQueue<DingdingQywxSyncReco
                         saveNumber += resultList.size();
                     } else {
                         //请求结果异常 结束
-                        throw new DingDingRequestException(result.errmsg);
+                        throw new ExceptionDingDingRequest(result.errmsg);
                     }
 
                 }

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/exception/DingDingRequestException.java

@@ -1,12 +0,0 @@
-package com.x.attendance.assemble.control.exception;
-
-import com.x.base.core.project.exception.PromptException;
-
-public class DingDingRequestException extends PromptException {
-
-    private static final long serialVersionUID = -2160589718239895222L;
-
-    public DingDingRequestException(String errorMsg) {
-        super(errorMsg);
-    }
-}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/exception/DingdingFindNoArgumentError.java

@@ -1,9 +0,0 @@
-package com.x.attendance.assemble.control.exception;
-
-import com.x.base.core.project.exception.PromptException;
-
-public class DingdingFindNoArgumentError extends PromptException {
-    public DingdingFindNoArgumentError() {
-        super("没有传入正确的参数");
-    }
-}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/exception/QywxFindNoArgumentError.java

@@ -1,9 +0,0 @@
-package com.x.attendance.assemble.control.exception;
-
-import com.x.base.core.project.exception.PromptException;
-
-public class QywxFindNoArgumentError extends PromptException {
-    public QywxFindNoArgumentError() {
-        super("没有传入正确的参数");
-    }
-}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/DingdingAttendanceFactory.java

@@ -2,8 +2,6 @@ package com.x.attendance.assemble.control.factory;
 
 import com.x.attendance.assemble.control.AbstractFactory;
 import com.x.attendance.assemble.control.Business;
-import com.x.attendance.assemble.control.exception.DingdingFindNoArgumentError;
-import com.x.attendance.assemble.control.exception.QywxFindNoArgumentError;
 import com.x.attendance.entity.*;
 import com.x.base.core.project.tools.DateTools;
 import org.apache.commons.lang3.time.DateUtils;
@@ -73,7 +71,7 @@ public class DingdingAttendanceFactory extends AbstractFactory {
      */
     public List<AttendanceDingtalkDetail> findAllDingdingAttendanceDetail(Date startTime, Date endTime, String userId) throws Exception {
         if (startTime == null && endTime == null && userId == null) {
-            throw new DingdingFindNoArgumentError();
+            throw new ExceptionDingdingFindNoArgumentError();
         }
         EntityManager em = this.entityManagerContainer().get(AttendanceDingtalkDetail.class);
         CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -107,7 +105,7 @@ public class DingdingAttendanceFactory extends AbstractFactory {
      */
     public List<AttendanceQywxDetail> findQywxAttendanceDetail(Date startTime, Date endTime, String userId) throws Exception {
         if (startTime == null && endTime == null && userId == null) {
-            throw new QywxFindNoArgumentError();
+            throw new ExceptionQywxFindNoArgumentError();
         }
         EntityManager em = this.entityManagerContainer().get(AttendanceQywxDetail.class);
         CriteriaBuilder cb = em.getCriteriaBuilder();

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/ExceptionDingdingFindNoArgumentError.java

@@ -0,0 +1,9 @@
+package com.x.attendance.assemble.control.factory;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionDingdingFindNoArgumentError extends PromptException {
+    public ExceptionDingdingFindNoArgumentError() {
+        super("没有传入正确的参数");
+    }
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/ExceptionQywxFindNoArgumentError.java

@@ -0,0 +1,9 @@
+package com.x.attendance.assemble.control.factory;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionQywxFindNoArgumentError extends PromptException {
+    public ExceptionQywxFindNoArgumentError() {
+        super("没有传入正确的参数");
+    }
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionImportFileUpload.java

@@ -6,7 +6,6 @@ import java.io.OutputStream;
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
@@ -14,10 +13,6 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import com.x.attendance.assemble.common.excel.reader.ExcelReaderUtil;
 import com.x.attendance.assemble.common.excel.reader.IRowReader;
 import com.x.attendance.assemble.common.excel.reader.ImportExcelReader;
-import com.x.attendance.assemble.control.jaxrs.attachment.exception.ExceptionCheckImportData;
-import com.x.attendance.assemble.control.jaxrs.attachment.exception.ExceptionEmptyExtension;
-import com.x.attendance.assemble.control.jaxrs.attachment.exception.ExceptionGetFileName;
-import com.x.attendance.assemble.control.jaxrs.fileimport.exception.ExceptionFileImportProcess;
 import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
 import com.x.attendance.entity.AttendanceImportFileInfo;
 import com.x.base.core.container.EntityManagerContainer;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/exception/ExceptionCheckImportData.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ExceptionCheckImportData.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attachment.exception;
+package com.x.attendance.assemble.control.jaxrs.attachment;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionCheckImportData extends PromptException {
+class ExceptionCheckImportData extends PromptException {
 
 	private static final long serialVersionUID = 4132300948670472899L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/exception/ExceptionEmptyExtension.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ExceptionEmptyExtension.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attachment.exception;
+package com.x.attendance.assemble.control.jaxrs.attachment;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionEmptyExtension extends PromptException {
+class ExceptionEmptyExtension extends PromptException {
 
 	private static final long serialVersionUID = 4132300948670472899L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ExceptionFileImportProcess.java

@@ -0,0 +1,12 @@
+package com.x.attendance.assemble.control.jaxrs.attachment;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionFileImportProcess extends PromptException {
+
+	private static final long serialVersionUID = 1859164370743532895L;
+
+	public ExceptionFileImportProcess(Throwable e, String message ) {
+		super("用户在进行考勤数据处理时发生异常！message:" + message, e );
+	}
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/exception/ExceptionGetFileName.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ExceptionGetFileName.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attachment.exception;
+package com.x.attendance.assemble.control.jaxrs.attachment;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionGetFileName extends PromptException {
+class ExceptionGetFileName extends PromptException {
 
 	private static final long serialVersionUID = 4132300948670472899L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionDelete.java

@@ -1,8 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceadmin;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionGet.java

@@ -1,8 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceadmin;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
 import com.x.attendance.entity.AttendanceAdmin;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionListAll.java

@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
 import com.x.attendance.entity.AttendanceAdmin;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionSave.java

@@ -10,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
 import com.x.attendance.entity.AttendanceAdmin;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.http.ActionResult;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/AttendanceAdminAction.java

@@ -16,7 +16,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import com.google.gson.JsonElement;
-import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.annotation.JaxrsParameterDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/exception/ExceptionAttendanceAdminProcess.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ExceptionAttendanceAdminProcess.java

@@ -1,12 +1,12 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceadmin;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceAdminProcess extends PromptException {
+class ExceptionAttendanceAdminProcess extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 
-	public ExceptionAttendanceAdminProcess( Throwable e, String message ) {
+	public ExceptionAttendanceAdminProcess(Throwable e, String message ) {
 		super("用户在进行考勤管理员信息配置处理时发生异常！message:" + message, e );
 	}
 }

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealArchive.java

@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealAudit.java

@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.http.ActionResult;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealCheck.java

@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.http.ActionResult;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealCreate.java

@@ -2,9 +2,7 @@ package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.AppealConfig;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceDetailNotExists;
+import com.x.attendance.entity.AppealConfig;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
@@ -14,7 +12,6 @@ import com.x.base.core.project.jaxrs.WoId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import org.apache.commons.lang3.StringUtils;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealProcessFirst.java

@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.http.ActionResult;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealProcessSecond.java

@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.http.ActionResult;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAttendanceDetailAppeal.java

@@ -5,13 +5,11 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.x.attendance.entity.AppealConfig;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.AppealConfig;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceDetailNotExists;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAttendanceDetailArchive.java

@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionDelete.java

@@ -1,8 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionGet.java

@@ -1,8 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
 import com.x.attendance.entity.AttendanceAppealInfo;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/AttendanceAppealInfoAction.java

@@ -16,7 +16,7 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import com.google.gson.JsonElement;
-import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
+
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.annotation.JaxrsParameterDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/exception/ExceptionAttendanceAppealNotExists.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ExceptionAttendanceAppealNotExists.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceAppealNotExists extends PromptException {
+class ExceptionAttendanceAppealNotExists extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/exception/ExceptionAttendanceAppealProcess.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ExceptionAttendanceAppealProcess.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceAppealProcess extends PromptException {
+class ExceptionAttendanceAppealProcess extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/exception/ExceptionAttendanceDetailNotExists.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ExceptionAttendanceDetailNotExists.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceDetailNotExists extends PromptException {
+class ExceptionAttendanceDetailNotExists extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/exception/ExceptionPersonHasNoIdenitity.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ExceptionPersonHasNoIdenitity.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionPersonHasNoIdenitity extends PromptException {
+class ExceptionPersonHasNoIdenitity extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/exception/ExceptionPersonHasNoUnit.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ExceptionPersonHasNoUnit.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionPersonHasNoUnit extends PromptException {
+class ExceptionPersonHasNoUnit extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionAnalyseAttendanceDetail.java

@@ -4,10 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailNotExists;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.attendance.entity.AttendanceStatisticalCycle;
 import com.x.attendance.entity.AttendanceWorkDayConfig;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionAnalyseAttendanceDetails.java

@@ -4,8 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
 import com.x.attendance.assemble.control.processor.sender.SenderForAnalyseData;
 import com.x.attendance.entity.AttendanceStatisticalCycle;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionArchiveAttendanceDetail.java

@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionCheckWithPersonByCycle.java

@@ -4,10 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionCycleMonthEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionCycleYearEmpty;
 import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
 import com.x.attendance.assemble.control.processor.sender.SenderForSupplementData;
 import com.x.attendance.entity.AttendanceEmployeeConfig;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionDelete.java

@@ -1,9 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailNotExists;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionDeleteMobile.java

@@ -1,8 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetaillMobileNotExists;
 import com.x.attendance.entity.AttendanceDetailMobile;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionGet.java

@@ -1,10 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailNotExists;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionGetMobile.java

@@ -1,10 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailMobileIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetaillMobileNotExists;
 import com.x.attendance.entity.AttendanceDetailMobile;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListImportByFileName.java

@@ -4,9 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionFileIdEmpty;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMobileWithFilter.java

@@ -5,14 +5,10 @@ import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.StringUtils;
-
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionQueryParameterEmpty;
 import com.x.attendance.entity.AttendanceDetailMobile;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.annotation.FieldDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListNextWithFilter.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.Business;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListPrevWithFilter.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.Business;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithEmployee.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithFilter.java

@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.annotation.FieldDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithTopUnit.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithUnit.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendance.java

@@ -9,9 +9,6 @@ import javax.servlet.http.HttpServletRequest;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionPersonNameEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionRecordDateEmpty;
 import com.x.attendance.entity.AttendanceDetail;
 import com.x.attendance.entity.AttendanceScheduleSetting;
 import com.x.attendance.entity.AttendanceSelfHoliday;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendanceMobile.java

@@ -10,11 +10,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.common.date.DateOperation;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAddressEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionLatitudeEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionLongitudeEmpty;
-import com.x.attendance.entity.AttendanceDetail;
 import com.x.attendance.entity.AttendanceDetailMobile;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.http.ActionResult;
@@ -129,10 +124,7 @@ public class ActionReciveAttendanceMobile extends BaseAction {
 		if( check ){
 			//对该员工的所有移动考勤数据进行一个整合
 			attendanceDetailServiceAdv.pushToDetail( currentPerson.getDistinguishedName(), attendanceDetailMobile.getRecordDateString() );
-			
-			
-			
-			  
+
 		}
 		return result;
 	}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/AttendanceDetailAction.java

@@ -17,7 +17,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import com.google.gson.JsonElement;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.annotation.JaxrsParameterDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/AttendanceDetailMobileAction.java

@@ -17,7 +17,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import com.google.gson.JsonElement;
-import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.annotation.JaxrsParameterDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionAddressEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionAddressEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAddressEmpty extends PromptException {
+class ExceptionAddressEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionAttendanceDetailProcess.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionAttendanceDetailProcess.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceDetailProcess extends PromptException {
+class ExceptionAttendanceDetailProcess extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionCycleMonthEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionCycleMonthEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionCycleMonthEmpty extends PromptException {
+class ExceptionCycleMonthEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionCycleYearEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionCycleYearEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionCycleYearEmpty extends PromptException {
+class ExceptionCycleYearEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionDateEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionDateEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionDateEmpty extends PromptException {
+class ExceptionDateEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionDetailIdEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionDetailIdEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionDetailIdEmpty extends PromptException {
+class ExceptionDetailIdEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionDetailMobileIdEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionDetailMobileIdEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionDetailMobileIdEmpty extends PromptException {
+class ExceptionDetailMobileIdEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionDetailNotExists.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionDetailNotExists.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionDetailNotExists extends PromptException {
+class ExceptionDetailNotExists extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionDetaillMobileNotExists.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionDetaillMobileNotExists.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionDetaillMobileNotExists extends PromptException {
+class ExceptionDetaillMobileNotExists extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionFileIdEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionFileIdEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionFileIdEmpty extends PromptException {
+class ExceptionFileIdEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionLatitudeEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionLatitudeEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionLatitudeEmpty extends PromptException {
+class ExceptionLatitudeEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionLongitudeEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionLongitudeEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionLongitudeEmpty extends PromptException {
+class ExceptionLongitudeEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionPersonNameEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionPersonNameEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionPersonNameEmpty extends PromptException {
+class ExceptionPersonNameEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionQueryParameterEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionQueryParameterEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionQueryParameterEmpty extends PromptException {
+class ExceptionQueryParameterEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionRecordDateEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionRecordDateEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionRecordDateEmpty extends PromptException {
+class ExceptionRecordDateEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/exception/ExceptionSignTimeEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ExceptionSignTimeEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendancedetail.exception;
+package com.x.attendance.assemble.control.jaxrs.attendancedetail;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionSignTimeEmpty extends PromptException {
+class ExceptionSignTimeEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionDelete.java

@@ -1,10 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigNotExists;
 import com.x.attendance.entity.AttendanceEmployeeConfig;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionGet.java

@@ -1,10 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigNotExists;
 import com.x.attendance.entity.AttendanceEmployeeConfig;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionListAll.java

@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
 import com.x.attendance.entity.AttendanceEmployeeConfig;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionSave.java

@@ -6,7 +6,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
 import com.x.attendance.assemble.control.ExceptionWrapInConvert;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
 import com.x.attendance.entity.AttendanceEmployeeConfig;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/AttendanceEmployeeConfigAction.java

@@ -16,7 +16,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import com.google.gson.JsonElement;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.annotation.JaxrsParameterDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/exception/ExceptionAttendanceEmployeeProcess.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ExceptionAttendanceEmployeeProcess.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceEmployeeProcess extends PromptException {
+class ExceptionAttendanceEmployeeProcess extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/exception/ExceptionConfigIdEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ExceptionConfigIdEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionConfigIdEmpty extends PromptException {
+class ExceptionConfigIdEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/exception/ExceptionConfigNotExists.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ExceptionConfigNotExists.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionConfigNotExists extends PromptException {
+class ExceptionConfigNotExists extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ActionDelete.java

@@ -3,12 +3,7 @@ package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
 import java.io.File;
 
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.StringUtils;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionFileIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionImportFileNotExists;
 import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
 import com.x.attendance.entity.AttendanceImportFileInfo;
 import com.x.base.core.project.http.ActionResult;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ActionGet.java

@@ -2,10 +2,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionFileIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionImportFileNotExists;
 import com.x.attendance.entity.AttendanceImportFileInfo;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ActionListAll.java

@@ -8,8 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.Gson;
-import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
 import com.x.attendance.assemble.control.processor.monitor.StatusImportFileDetail;
 import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
 import com.x.attendance.entity.AttendanceImportFileInfo;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/AttendanceImportFileInfoAction.java

@@ -13,8 +13,6 @@ import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
 import com.x.base.core.project.annotation.JaxrsParameterDescribe;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ExceptionAttendanceEmployeeProcess.java

@@ -0,0 +1,12 @@
+package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionAttendanceEmployeeProcess extends PromptException {
+
+	private static final long serialVersionUID = 1859164370743532895L;
+
+	public ExceptionAttendanceEmployeeProcess( Throwable e, String message ) {
+		super("用户在进行考勤人员配置信息处理时发生异常！message:" + message, e );
+	}
+}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/exception/ExceptionAttendanceImportFileProcess.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ExceptionAttendanceImportFileProcess.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionAttendanceImportFileProcess extends PromptException {
+class ExceptionAttendanceImportFileProcess extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/exception/ExceptionFileIdEmpty.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ExceptionFileIdEmpty.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionFileIdEmpty extends PromptException {
+class ExceptionFileIdEmpty extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/exception/ExceptionImportFileNotExists.java → o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ExceptionImportFileNotExists.java

@@ -1,8 +1,8 @@
-package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception;
+package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
 
 import com.x.base.core.project.exception.PromptException;
 
-public class ExceptionImportFileNotExists extends PromptException {
+class ExceptionImportFileNotExists extends PromptException {
 
 	private static final long serialVersionUID = 1859164370743532895L;
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionDelete.java

@@ -1,10 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNotExists;
 import com.x.attendance.entity.AttendanceScheduleSetting;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionGet.java

@@ -1,10 +1,6 @@
 package com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleIdEmpty;
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNotExists;
 import com.x.attendance.entity.AttendanceScheduleSetting;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionListAll.java

@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
 import com.x.attendance.entity.AttendanceScheduleSetting;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionListByTopUnit.java

@@ -4,9 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNameEmpty;
 import com.x.attendance.entity.AttendanceScheduleSetting;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionListByUnit.java

@@ -4,9 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
-import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNameEmpty;
 import com.x.attendance.entity.AttendanceScheduleSetting;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;