From 2aee8bc983e828d9f75c72a4adb41e0d243ec40c Mon Sep 17 00:00:00 2001 From: zhourui Date: Fri, 25 Sep 2020 09:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4okr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2server/pom.xml | 7 - o2server/x_okr_assemble_control/pom.xml | 129 -- .../assemble/common/date/DateOperation.java | 1046 ----------- .../okr/assemble/common/date/MonthOfYear.java | 70 - .../okr/assemble/common/date/WeekOfYear.java | 70 - .../common/excel/reader/Excel2003Reader.java | 278 --- .../common/excel/reader/Excel2007Reader.java | 232 --- .../common/excel/reader/ExcelReaderUtil.java | 57 - .../common/excel/reader/IRowReader.java | 13 - .../excel/reader/UserModelEventListener.java | 219 --- .../excel/writer/AbstractExcel2007Writer.java | 264 --- .../common/excel/writer/Excel2003Writer.java | 63 - .../excel/writer/Excel2007WriterImpl.java | 30 - .../WorkReportContentExportExcelWriter.java | 203 -- .../WorkReportStatusExportExcelWriter.java | 156 -- .../common/excel/writer/XMLEncoder.java | 48 - .../okr/assemble/control/AbstractFactory.java | 24 - .../ApplicationServletContextListener.java | 33 - .../com/x/okr/assemble/control/Business.java | 224 --- .../x/okr/assemble/control/OkrUserCache.java | 92 - .../okr/assemble/control/ThisApplication.java | 97 - .../webservice/WebservicesClient.java | 42 - .../webservice/sms/SmsMessage.java | 25 - .../webservice/sms/SmsMessageOperator.java | 57 - .../dataadapter/wftask/WfReadCountGetter.java | 74 - .../dataadapter/wftask/WfTaskCountGetter.java | 74 - .../workflow/WorkComplexGetter.java | 251 --- .../workflow/WorkFlowReaderAdder.java | 62 - .../dataadapter/workflow/WorkFlowStarter.java | 35 - .../factory/OkrAttachmentFileInfoFactory.java | 58 - .../factory/OkrCenterWorkInfoFactory.java | 440 ----- .../factory/OkrConfigSecretaryFactory.java | 166 -- .../factory/OkrConfigSystemFactory.java | 139 -- .../factory/OkrConfigWorkLevelFactory.java | 58 - .../factory/OkrConfigWorkTypeFactory.java | 58 - .../OkrErrorSystemIdentityInfoFactory.java | 91 - .../OkrStatisticReportContentFactory.java | 390 ---- .../OkrStatisticReportStatusFactory.java | 185 -- .../control/factory/OkrTaskFactory.java | 380 ---- .../factory/OkrTaskHandledFactory.java | 157 -- .../control/factory/OkrUserInfoFactory.java | 80 - .../factory/OkrWorkAppraiseInfoFactory.java | 73 - .../OkrWorkAuthorizeRecordFactory.java | 280 --- .../factory/OkrWorkBaseInfoFactory.java | 842 --------- .../control/factory/OkrWorkChatFactory.java | 295 --- .../factory/OkrWorkDetailInfoFactory.java | 91 - .../factory/OkrWorkDynamicsFactory.java | 349 ---- .../control/factory/OkrWorkPersonFactory.java | 1432 --------------- .../factory/OkrWorkPersonSearchFactory.java | 211 --- .../factory/OkrWorkReportBaseInfoFactory.java | 666 ------- .../OkrWorkReportDetailInfoFactory.java | 95 - .../OkrWorkReportPersonLinkFactory.java | 368 ---- .../OkrWorkReportProcessLogFactory.java | 341 ---- .../control/jaxrs/ActionApplication.java | 86 - .../control/jaxrs/OkrAnonyJaxrsFilter.java | 10 - .../control/jaxrs/OkrJaxrsFilter.java | 48 - .../control/jaxrs/WorkCommonQueryFilter.java | 136 -- .../control/jaxrs/WorkCommonSearchFilter.java | 262 --- .../control/jaxrs/WorkPersonSearchFilter.java | 235 --- .../ActionWorkAppraiseStatusSync.java | 154 -- .../control/jaxrs/appraise/BaseAction.java | 7 - .../jaxrs/appraise/OkrWorkAppraiseAction.java | 56 - .../ExceptionWorkAppraiseProcess.java | 12 - .../ActionStatisticReportContentExport.java | 90 - .../ActionStatisticReportStatusExport.java | 90 - .../control/jaxrs/export/BaseAction.java | 7 - .../control/jaxrs/export/OkrExportAction.java | 69 - .../jaxrs/identity/ActionChangeIdentity.java | 174 -- .../control/jaxrs/identity/ActionCheck.java | 30 - ...tionErrorInfoFilterListNextWithFilter.java | 159 -- .../jaxrs/identity/ActionGetErrorRecords.java | 156 -- .../ActionGetOkrErrorIdentityRecords.java | 156 -- .../ActionReplaceOrganWithCheckTable.java | 36 - .../jaxrs/identity/ActionTestReplace.java | 32 - .../control/jaxrs/identity/BaseAction.java | 15 - .../OkrSystemErrorIdentityProcessAction.java | 150 -- .../identity/entity/ErrorIdentityRecord.java | 58 - .../identity/entity/ErrorIdentityRecords.java | 28 - .../ExceptionFilterIdentityEmpty.java | 12 - .../exception/ExceptionIdentityCheck.java | 12 - .../exception/ExceptionNewIdentityEmpty.java | 12 - .../ExceptionNewIdentityNotExists.java | 12 - .../exception/ExceptionOldIdentityEmpty.java | 12 - .../exception/ExceptionRecordIdEmpty.java | 12 - .../exception/ExceptionRecordTypeEmpty.java | 12 - .../exception/ExceptionTableNameEmpty.java | 12 - .../jaxrs/login/ActionGetLoginUser.java | 27 - .../control/jaxrs/login/ActionLogin.java | 155 -- .../control/jaxrs/login/ActionLogout.java | 38 - .../control/jaxrs/login/BaseAction.java | 110 -- .../control/jaxrs/login/OkrLoginAction.java | 69 - .../control/jaxrs/login/OkrLogoutAction.java | 50 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionOkrSystemAdminCheck.java | 12 - .../ExceptionUserHasNoProxyIdentity.java | 12 - .../exception/ExceptionUserIdentityQuery.java | 16 - .../exception/ExceptionUserProxyQuery.java | 12 - .../jaxrs/mind/ActionListMindForCenterId.java | 827 --------- .../control/jaxrs/mind/BaseAction.java | 14 - .../control/jaxrs/mind/OkrWorkMindAction.java | 61 - .../ExceptionCenterWorkNotExists.java | 12 - .../ExceptionDeployedWorkListAll.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../mind/exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionViewableWorkList.java | 16 - .../ActionCenterAttachmentDownload.java | 36 - .../ActionCenterAttachmentDownloadStream.java | 36 - .../ActionCenterAttachmentUpload.java | 142 -- .../ActionDeleteCenterAttachment.java | 134 -- .../ActionDeleteReportAttachment.java | 140 -- .../ActionDeleteWorkAttachment.java | 144 -- .../okrattachmentfileinfo/ActionGet.java | 66 - .../ActionListWithCenterId.java | 73 - .../ActionListWithReportId.java | 72 - .../ActionListWithWorkId.java | 89 - .../ActionReportAttachmentDownload.java | 36 - .../ActionReportAttachmentDownloadStream.java | 36 - .../ActionReportAttachmentUpload.java | 142 -- .../ActionWorkAttachmentDownload.java | 36 - .../ActionWorkAttachmentDownloadStream.java | 36 - .../ActionWorkAttachmentUpload.java | 145 -- .../okrattachmentfileinfo/BaseAction.java | 20 - .../OkrAttachmentFileInfoAction.java | 340 ---- .../AttachmentNotExistsException.java | 12 - .../AttachmentQueryByIdException.java | 12 - .../exception/ExceptionAttachmentDelete.java | 12 - .../exception/ExceptionAttachmentIdEmpty.java | 12 - .../ExceptionAttachmentListByIds.java | 12 - .../ExceptionAttachmentNotExists.java | 12 - .../ExceptionAttachmentQueryById.java | 12 - .../exception/ExceptionAttachmentWrapOut.java | 12 - .../exception/ExceptionCenterWorkIdEmpty.java | 12 - .../ExceptionCenterWorkNotExists.java | 12 - .../ExceptionCenterWorkQueryById.java | 12 - .../exception/ExceptionEmptyExtension.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionInsufficientPermissions.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../exception/ExceptionWorkQueryById.java | 12 - .../exception/ExceptionWorkReportIdEmpty.java | 12 - .../ExceptionWorkReportNotExists.java | 12 - .../ExceptionWorkReportQueryById.java | 12 - .../ReportAttachmentUploadException.java | 12 - .../exception/URLParameterGetException.java | 12 - .../exception/WorkNotExistsException.java | 12 - .../exception/WorkQueryByIdException.java | 12 - .../WorkReportNotExistsException.java | 12 - .../WorkReportQueryByIdException.java | 12 - .../okrauthorize/ActionWorkAuthorize.java | 256 --- .../okrauthorize/ActionWorkTackback.java | 171 -- .../jaxrs/okrauthorize/BaseAction.java | 17 - .../okrauthorize/OkrWorkAuthorizeAction.java | 87 - .../ExceptionAuthorizeOpinionEmpty.java | 12 - .../ExceptionAuthorizeTakerIdentityEmpty.java | 12 - .../ExceptionAuthorizeWorkIdEmpty.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../exception/ExceptionPersonNotExists.java | 12 - .../exception/ExceptionSystemConfigFetch.java | 12 - .../ExceptionSystemConfigNotFetch.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../ExceptionWorkAuthorizeNotOpen.java | 12 - .../ExceptionWorkAuthorizeProcess.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../exception/ExceptionWorkQueryById.java | 12 - .../ExceptionWorkTackbackProcess.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrcenterworkinfo/ActionArchive.java | 84 - .../jaxrs/okrcenterworkinfo/ActionDelete.java | 80 - .../okrcenterworkinfo/ActionDeleteAdmin.java | 96 - .../jaxrs/okrcenterworkinfo/ActionDeploy.java | 207 --- .../ActionDraftNewCenter.java | 131 -- .../jaxrs/okrcenterworkinfo/ActionGet.java | 93 - .../okrcenterworkinfo/ActionGetAdmin.java | 63 - ...onListByProcessIdentityNextWithFilter.java | 345 ---- ...onListByProcessIdentityPrevWithFilter.java | 347 ---- .../ActionListNextWithFilter.java | 381 ---- .../ActionListNextWithFilterAdmin.java | 158 -- .../ActionListOperationWithId.java | 156 -- .../ActionListPrevWithFilter.java | 379 ---- .../ActionListPrevWithFilterAdmin.java | 157 -- .../jaxrs/okrcenterworkinfo/ActionSave.java | 200 -- .../jaxrs/okrcenterworkinfo/BaseAction.java | 339 ---- .../OkrCenterWorkInfoAction.java | 623 ------- .../OkrCenterWorkInfoAdminAction.java | 112 -- .../exception/ExceptionCenterWorkArchive.java | 12 - .../ExceptionCenterWorkAuditLeaderEmpty.java | 12 - .../exception/ExceptionCenterWorkDelete.java | 12 - .../exception/ExceptionCenterWorkDeploy.java | 12 - .../exception/ExceptionCenterWorkIdEmpty.java | 12 - .../ExceptionCenterWorkListFilter.java | 12 - .../ExceptionCenterWorkNotExists.java | 12 - .../ExceptionCenterWorkQueryById.java | 12 - .../exception/ExceptionCenterWorkSave.java | 12 - .../ExceptionCenterWorkTitleEmpty.java | 12 - ...ExceptionCenterWorkTitleLengthInvalid.java | 12 - .../exception/ExceptionCenterWorkWrapIn.java | 12 - .../exception/ExceptionCenterWorkWrapOut.java | 12 - .../ExceptionCompleteDateLimitFormat.java | 12 - .../ExceptionDeployableWorkQuery.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionInsufficientPermissions.java | 12 - .../ExceptionOkrOperationDynamicSave.java | 16 - .../ExceptionOkrSystemAdminCheck.java | 12 - .../ExceptionSystemWorkManagerCheck.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionUserUnitQuery.java | 12 - .../exception/ExceptionWorkDeploy.java | 12 - .../exception/ExceptionWorkPersonQuery.java | 16 - .../exception/ExceptionWorkTaskCreate.java | 12 - .../exception/ExceptionWorkTaskQuery.java | 12 - .../exception/ExceptionWorkTaskRemove.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrconfigsercretary/ActionDelete.java | 97 - .../jaxrs/okrconfigsercretary/ActionGet.java | 80 - .../ActionListMySercretary.java | 74 - .../ActionListNextWithFilter.java | 157 -- .../ActionListPrevWithFilter.java | 157 -- .../jaxrs/okrconfigsercretary/ActionSave.java | 176 -- .../jaxrs/okrconfigsercretary/BaseAction.java | 18 - .../OkrConfigSecretaryAction.java | 149 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionGetTopUnitNameByIdentity.java | 12 - .../ExceptionGetUnitNameByIdentity.java | 12 - .../ExceptionSercretaryConfigDelete.java | 12 - .../ExceptionSercretaryConfigIdEmpty.java | 12 - ...onSercretaryConfigLeaderIdentityEmpty.java | 12 - .../ExceptionSercretaryConfigListByIds.java | 12 - .../ExceptionSercretaryConfigNotExists.java | 12 - .../ExceptionSercretaryConfigProcess.java | 12 - .../ExceptionSercretaryConfigQueryById.java | 12 - .../ExceptionSercretaryConfigSave.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../ActionAllowedDeployWork.java | 68 - .../jaxrs/okrconfigsystem/ActionDelete.java | 84 - .../jaxrs/okrconfigsystem/ActionGet.java | 74 - .../okrconfigsystem/ActionGetByCode.java | 103 -- .../jaxrs/okrconfigsystem/ActionListAll.java | 76 - .../jaxrs/okrconfigsystem/ActionSave.java | 214 --- .../jaxrs/okrconfigsystem/BaseAction.java | 26 - .../OkrConfigSystemAction.java | 155 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionSystemConfigCodeEmpty.java | 12 - .../ExceptionSystemConfigDelete.java | 12 - .../ExceptionSystemConfigIdEmpty.java | 12 - .../ExceptionSystemConfigListAll.java | 12 - .../ExceptionSystemConfigNotExists.java | 12 - .../ExceptionSystemConfigQueryByCode.java | 12 - .../ExceptionSystemConfigQueryById.java | 12 - .../exception/ExceptionSystemConfigSave.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrconfigworklevel/ActionDelete.java | 98 - .../jaxrs/okrconfigworklevel/ActionGet.java | 69 - .../okrconfigworklevel/ActionListAll.java | 59 - .../jaxrs/okrconfigworklevel/ActionSave.java | 99 - .../jaxrs/okrconfigworklevel/BaseAction.java | 13 - .../OkrConfigWorkLevelAction.java | 113 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../exception/ExceptionUserNoLogin.java | 12 - .../ExceptionWorkLevelConfigDelete.java | 12 - .../ExceptionWorkLevelConfigIdEmpty.java | 12 - .../ExceptionWorkLevelConfigListAll.java | 12 - .../ExceptionWorkLevelConfigNotExists.java | 12 - .../ExceptionWorkLevelConfigQueryById.java | 12 - .../ExceptionWorkLevelConfigSave.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../jaxrs/okrconfigworktype/BaseAction.java | 24 - .../jaxrs/okrconfigworktype/ExcuteDelete.java | 100 - .../jaxrs/okrconfigworktype/ExcuteGet.java | 87 - .../okrconfigworktype/ExcuteListAll.java | 81 - .../ExcuteListTypeCount.java | 113 -- .../jaxrs/okrconfigworktype/ExcuteSave.java | 114 -- .../OkrConfigWorkTypeAction.java | 131 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../exception/ExceptionUserNoLogin.java | 12 - .../ExceptionWorkTypeConfigDelete.java | 12 - .../ExceptionWorkTypeConfigIdEmpty.java | 12 - .../ExceptionWorkTypeConfigListAll.java | 12 - .../ExceptionWorkTypeConfigListTypeCount.java | 12 - .../ExceptionWorkTypeConfigNotExists.java | 12 - .../ExceptionWorkTypeConfigQueryById.java | 12 - .../ExceptionWorkTypeConfigSave.java | 12 - .../ExceptionWorkTypeConfigValidate.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../jaxrs/okrtask/ActionCountMyTask.java | 80 - .../control/jaxrs/okrtask/ActionDelete.java | 130 -- .../control/jaxrs/okrtask/ActionGet.java | 70 - .../ActionListMyTaskNextWithFilter.java | 171 -- .../okrtask/ActionListNextWithFilter.java | 162 -- .../okrtask/ActionListPrevWithFilter.java | 160 -- .../jaxrs/okrtask/ActionListTaskCollect.java | 715 -------- .../jaxrs/okrtask/ActionReadProcess.java | 124 -- .../control/jaxrs/okrtask/ActionSendSms.java | 127 -- .../control/jaxrs/okrtask/BaseAction.java | 26 - .../jaxrs/okrtask/OkrAnonymousTaskAction.java | 57 - .../control/jaxrs/okrtask/OkrTaskAction.java | 138 -- .../jaxrs/okrtask/OkrTaskAdminAction.java | 120 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionInsufficientPermissions.java | 12 - .../ExceptionOkrOperationDynamicSave.java | 16 - .../ExceptionOkrSystemAdminCheck.java | 12 - .../exception/ExceptionPersonNotExists.java | 12 - .../exception/ExceptionPersonQueryByFlag.java | 12 - .../exception/ExceptionReadProcess.java | 12 - .../ExceptionSystemConfigQueryByCode.java | 12 - .../exception/ExceptionTaskCountQuery.java | 12 - .../exception/ExceptionTaskDelete.java | 12 - .../exception/ExceptionTaskIdEmpty.java | 12 - .../ExceptionTaskInfoIsNotForRead.java | 12 - .../ExceptionTaskListByTaskType.java | 12 - .../exception/ExceptionTaskNotExists.java | 13 - .../ExceptionTaskProcessPermission.java | 12 - .../exception/ExceptionTaskQueryById.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../exception/ExceptionWorkQueryById.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../jaxrs/okrtaskhandled/ActionDelete.java | 130 -- .../jaxrs/okrtaskhandled/ActionGet.java | 73 - .../ActionListNextWithFilter.java | 143 -- .../ActionListPrevWithFilter.java | 143 -- .../jaxrs/okrtaskhandled/BaseAction.java | 17 - .../okrtaskhandled/OkrTaskHandledAction.java | 49 - .../OkrTaskHandledAdminAction.java | 114 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionInsufficientPermissions.java | 12 - .../ExceptionOkrSystemAdminCheck.java | 12 - .../exception/ExceptionTaskHandledDelete.java | 12 - .../ExceptionTaskHandledIdEmpty.java | 12 - .../ExceptionTaskHandledNotExists.java | 13 - .../ExceptionTaskHandledQueryById.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrworkauthorizerecord/ActionGet.java | 70 - .../okrworkauthorizerecord/BaseAction.java | 10 - .../OkrWorkAuthorizeRecordAction.java | 48 - .../ExceptionAuthorizeRecordIdEmpty.java | 12 - .../ExceptionAuthorizeRecordNotExists.java | 12 - .../ExceptionAuthorizeRecordQueryById.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../exception/ExceptionUserNoLogin.java | 12 - .../jaxrs/okrworkbaseinfo/ActionAppraise.java | 116 -- .../jaxrs/okrworkbaseinfo/ActionArchive.java | 85 - .../jaxrs/okrworkbaseinfo/ActionDelete.java | 123 -- .../okrworkbaseinfo/ActionDeleteForce.java | 90 - .../jaxrs/okrworkbaseinfo/ActionDeploy.java | 170 -- .../jaxrs/okrworkbaseinfo/ActionGet.java | 164 -- .../okrworkbaseinfo/ActionGetForAdmin.java | 158 -- .../ActionGetMyWorkStatistic.java | 206 --- .../ActionGetWorkOperationWithId.java | 323 ---- .../ActionListAllWorkByCenterId.java | 94 - .../ActionListDeployWorkInCenterForForm.java | 339 ---- ...MyWorkByProcessIdentityNextWithFilter.java | 334 ---- ...MyWorkByProcessIdentityPrevWithFilter.java | 332 ---- .../ActionListNextWithFilter.java | 118 -- .../ActionListPrevWithFilter.java | 118 -- .../ActionListProcessWorkInCenterForForm.java | 275 --- .../okrworkbaseinfo/ActionListSubWork.java | 95 - .../ActionListUsersWorkByCenterId.java | 104 -- .../okrworkbaseinfo/ActionProgressAdjust.java | 91 - .../jaxrs/okrworkbaseinfo/ActionRecycle.java | 87 - .../jaxrs/okrworkbaseinfo/ActionSave.java | 397 ---- .../jaxrs/okrworkbaseinfo/ActionViewWork.java | 1168 ------------ .../jaxrs/okrworkbaseinfo/ActionWfSync.java | 65 - .../ActionWorkCanDismantling.java | 75 - .../jaxrs/okrworkbaseinfo/BaseAction.java | 1528 ---------------- .../OkrWorkBaseInfoAction.java | 1222 ------------- .../OkrWorkBaseInfoAdminAction.java | 140 -- .../jaxrs/okrworkbaseinfo/WrapInFilter.java | 237 --- .../exception/ExceptionCenterWorkIdEmpty.java | 12 - .../ExceptionCenterWorkNotExists.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionInsufficientPermissions.java | 12 - .../ExceptionReportCycleInvalid.java | 12 - .../ExceptionReportDayInCycleEmpty.java | 12 - .../ExceptionReportDayInCycleInvalid.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWfWorkIdEmpty.java | 12 - .../ExceptionWorkBaseInfoProcess.java | 15 - .../exception/ExceptionWorkCanNotDelete.java | 14 - .../ExceptionWorkCompleteDateLimitEmpty.java | 12 - .../ExceptionWorkCooperateInvalid.java | 14 - .../exception/ExceptionWorkDetailEmpty.java | 12 - .../exception/ExceptionWorkIdEmpty.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../ExceptionWorkReadLeaderInvalid.java | 15 - .../ExceptionWorkResponsibilityEmpty.java | 12 - .../ExceptionWorkResponsibilityInvalid.java | 12 - .../jaxrs/okrworkchat/ActionDelete.java | 99 - .../control/jaxrs/okrworkchat/ActionGet.java | 68 - .../okrworkchat/ActionListWithFilterNext.java | 177 -- .../okrworkchat/ActionListWithFilterPrev.java | 176 -- .../control/jaxrs/okrworkchat/ActionSave.java | 147 -- .../control/jaxrs/okrworkchat/BaseAction.java | 16 - .../jaxrs/okrworkchat/OkrWorkChatAction.java | 144 -- .../exception/ExceptionGetOkrUserCache.java | 16 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionWorkChatDelete.java | 12 - .../exception/ExceptionWorkChatFilter.java | 12 - .../exception/ExceptionWorkChatIdEmpty.java | 12 - .../exception/ExceptionWorkChatNotExists.java | 12 - .../exception/ExceptionWorkChatQueryById.java | 12 - .../exception/ExceptionWorkChatSave.java | 12 - .../exception/ExceptionWorkIdEmpty.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../exception/ExceptionWorkQueryById.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../jaxrs/okrworkdetailinfo/ActionDelete.java | 41 - .../jaxrs/okrworkdetailinfo/ActionGet.java | 70 - .../jaxrs/okrworkdetailinfo/ActionSave.java | 90 - .../jaxrs/okrworkdetailinfo/BaseAction.java | 12 - .../OkrWorkDetailInfoAction.java | 105 -- .../exception/ExceptionWorkDetailDelete.java | 12 - .../exception/ExceptionWorkDetailSave.java | 12 - .../exception/ExceptionWorkIdEmpty.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../exception/ExceptionWorkQueryById.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../jaxrs/okrworkdynamics/ActionDelete.java | 41 - .../jaxrs/okrworkdynamics/ActionGet.java | 66 - .../ActionListWithFilterNext.java | 241 --- .../ActionListWithFilterPrev.java | 242 --- .../jaxrs/okrworkdynamics/ActionSave.java | 63 - .../jaxrs/okrworkdynamics/BaseAction.java | 14 - .../OkrWorkDynamicsAction.java | 128 -- .../ExceptionDeployWorkIdsQuery.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../exception/ExceptionUserNoLogin.java | 12 - .../ExceptionViewableWorkIdsQuery.java | 12 - .../ExceptionWorkDynamicsDelete.java | 12 - .../ExceptionWorkDynamicsFilter.java | 12 - .../ExceptionWorkDynamicsIdEmpty.java | 12 - .../ExceptionWorkDynamicsNotExists.java | 12 - .../ExceptionWorkDynamicsQueryById.java | 12 - .../exception/ExceptionWorkDynamicsSave.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrworkperson/WrapInOkrWorkPerson.java | 15 - .../okrworkperson/WrapOutOkrWorkPerson.java | 23 - .../ActionAutoCreateWorkReport.java | 31 - .../okrworkreportbaseinfo/ActionDelete.java | 123 -- .../ActionDispatchToOver.java | 103 -- .../ActionDraftReport.java | 342 ---- .../okrworkreportbaseinfo/ActionGet.java | 362 ---- .../ActionGetFullInfo.java | 113 -- .../ActionListByWork.java | 93 - .../ActionListDraftNextWithFilter.java | 107 -- .../ActionListDraftPrevWithFilter.java | 107 -- .../ActionListMyArchiveNextWithFilter.java | 127 -- .../ActionListMyArchivePrevWithFilter.java | 127 -- .../ActionListMyProcessNextWithFilter.java | 129 -- .../ActionListMyProcessPrevWithFilter.java | 129 -- .../ActionListMyTaskNextWithFilter.java | 131 -- .../ActionListMyTaskPrevWithFilter.java | 129 -- .../ActionListNextWithFilter.java | 278 --- .../ActionListPrevWithFilter.java | 278 --- .../okrworkreportbaseinfo/ActionSave.java | 111 -- .../ActionSaveAdminSupervise.java | 40 - .../ActionSaveDraftReport.java | 248 --- .../ActionSaveLeaderOpinion.java | 74 - .../okrworkreportbaseinfo/ActionSubmit.java | 156 -- .../ActionSubmitAdminSupervise.java | 127 -- .../ActionSubmitDraftReport.java | 265 --- .../ActionSubmitLeaderOpinion.java | 169 -- .../okrworkreportbaseinfo/BaseAction.java | 1547 ---------------- .../OkrWorkReportBaseInfoAction.java | 358 ---- .../OkrWorkReportBaseInfoAdminAction.java | 134 -- .../okrworkreportbaseinfo/WrapInFilter.java | 234 --- .../ExceptionAdminSuperviseInfoEmpty.java | 12 - .../ExceptionAdminSuperviseSave.java | 12 - .../ExceptionCenterWorkNotExists.java | 12 - .../ExceptionCenterWorkQueryById.java | 12 - .../exception/ExceptionGetOkrUserCache.java | 16 - .../ExceptionLeaderOpinionEmpty.java | 12 - .../exception/ExceptionLeaderOpinionSave.java | 12 - .../ExceptionLeaderOpinionSubmit.java | 12 - .../ExceptionReportProcessLogList.java | 12 - .../ExceptionSystemConfigQueryByCode.java | 12 - .../exception/ExceptionUserNoLogin.java | 12 - .../exception/ExceptionUserUnitQuery.java | 12 - .../exception/ExceptionWorkIdEmpty.java | 12 - .../exception/ExceptionWorkNotExists.java | 12 - .../exception/ExceptionWorkQueryById.java | 12 - .../ExceptionWorkReportAdminProcess.java | 12 - .../exception/ExceptionWorkReportDelete.java | 12 - .../ExceptionWorkReportDetailQueryById.java | 12 - .../ExceptionWorkReportDispatchOver.java | 12 - .../ExceptionWorkReportDraftSubmit.java | 12 - .../exception/ExceptionWorkReportFilter.java | 12 - .../exception/ExceptionWorkReportIdEmpty.java | 12 - .../ExceptionWorkReportLeaderSubmit.java | 12 - .../ExceptionWorkReportListByWorkId.java | 12 - ...xceptionWorkReportMaxReportCountQuery.java | 12 - .../ExceptionWorkReportNotExists.java | 12 - .../ExceptionWorkReportQueryById.java | 12 - .../exception/ExceptionWorkReportSave.java | 12 - .../exception/ExceptionWorkReportSubmit.java | 12 - .../exception/ExceptionWorkReportWrapOut.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrworkreportdetailinfo/ActionDelete.java | 40 - .../okrworkreportdetailinfo/ActionGet.java | 69 - .../okrworkreportdetailinfo/ActionSave.java | 63 - .../okrworkreportdetailinfo/BaseAction.java | 10 - .../OkrWorkReportDetailInfoAction.java | 88 - .../ExceptionReportDetailDelete.java | 12 - .../ExceptionReportDetailIdEmpty.java | 12 - .../ExceptionReportDetailNotExists.java | 12 - .../ExceptionReportDetailQueryById.java | 12 - .../exception/ExceptionReportDetailSave.java | 12 - .../ExceptionReportDetailWrapOut.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrworkreportpersonlink/ActionDelete.java | 40 - .../okrworkreportpersonlink/ActionGet.java | 70 - .../okrworkreportpersonlink/ActionSave.java | 64 - .../okrworkreportpersonlink/BaseAction.java | 10 - .../OkrWorkReportPersonLinkAction.java | 89 - .../ExceptionReportDetailWrapOut.java | 12 - .../ExceptionReportPersonLinkDelete.java | 12 - .../ExceptionReportPersonLinkIdEmpty.java | 12 - .../ExceptionReportPersonLinkNotExists.java | 12 - .../ExceptionReportPersonLinkQueryById.java | 12 - .../ExceptionReportPersonLinkSave.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../okrworkreportprocesslog/ActionDelete.java | 41 - .../okrworkreportprocesslog/ActionGet.java | 70 - .../okrworkreportprocesslog/ActionSave.java | 63 - .../okrworkreportprocesslog/BaseAction.java | 10 - .../OkrWorkReportProcessLogAction.java | 89 - .../ExceptionReportProcessLogDelete.java | 12 - .../ExceptionReportProcessLogIdEmpty.java | 12 - .../ExceptionReportProcessLogNotExists.java | 12 - .../ExceptionReportProcessLogQueryById.java | 12 - .../ExceptionReportProcessLogSave.java | 12 - .../ExceptionReportProcessLogWrapOut.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../jaxrs/queue/QueueWorkDynamicRecord.java | 35 - .../jaxrs/queue/WrapInWorkDynamic.java | 204 --- .../jaxrs/statistic/ActionDateList.java | 110 -- .../jaxrs/statistic/ActionFilterExport.java | 131 -- .../jaxrs/statistic/ActionFilterList.java | 156 -- .../jaxrs/statistic/ActionFilterSubList.java | 159 -- .../ActionStReportContentCaculate.java | 29 - .../ActionStReportContentCaculateAll.java | 29 - .../ActionStReportContentExport.java | 83 - .../ActionStReportContentListByFilter.java | 47 - ...ActionStReportContentListDateByFilter.java | 46 - .../ActionStReportContentListSubByFilter.java | 48 - .../ActionStReportStatusCaculate.java | 29 - .../ActionStReportStatusCaculateAll.java | 29 - .../statistic/ActionStReportStatusExport.java | 161 -- .../ActionStReportStatusListByFilter.java | 143 -- .../jaxrs/statistic/ActionStTreeByFilter.java | 46 - .../control/jaxrs/statistic/BaseAction.java | 888 --------- .../OkrStatisticReportContentAction.java | 173 -- .../OkrStatisticReportStatusAction.java | 108 -- ...WrapInFilterOkrStatisticReportContent.java | 141 -- .../WrapInFilterOkrStatisticReportStatus.java | 88 - .../exception/ExceptionQueryEndDateEmpty.java | 12 - .../ExceptionQueryEndDateInvalid.java | 12 - .../ExceptionQueryParentIdEmpty.java | 12 - .../ExceptionQueryStartDateEmpty.java | 12 - .../ExceptionQueryStartDateInvalid.java | 12 - .../ExceptionQueryWithCondition.java | 12 - .../ExceptionReportStatisitcList.java | 12 - .../ExceptionReportStatisitcListWithIds.java | 12 - .../ExceptionReportStatisitcWrapOut.java | 12 - .../ExceptionStatisticTimeInvalid.java | 12 - .../exception/ExceptionWrapInConvert.java | 13 - .../control/jaxrs/uuid/UUIDAction.java | 64 - .../jaxrs/workimport/ActionWorkImport.java | 786 -------- .../control/jaxrs/workimport/BaseAction.java | 20 - .../workimport/CacheImportFileStatus.java | 75 - .../workimport/CacheImportRowDetail.java | 312 ---- .../jaxrs/workimport/OkrWorkImportAction.java | 55 - .../workimport/WorkImportExcelReader.java | 220 --- .../CenterWorkNotExistsException.java | 12 - .../CenterWorkQueryByIdException.java | 12 - .../exception/ExcelReadException.java | 12 - .../exception/GetOkrUserCacheException.java | 16 - .../workimport/exception/NoDataException.java | 12 - .../ReportCycleInvalidException.java | 12 - .../ReportDayInCycleEmptyException.java | 12 - .../ReportDayInCycleInvalidException.java | 12 - .../exception/UserNoLoginException.java | 12 - .../exception/UserUnitQueryException.java | 12 - .../WorkCompleteDateLimitEmptyException.java | 12 - .../WorkCompleteDateLimitFormatException.java | 12 - .../WorkCooperateInvalidException.java | 12 - .../WorkImportDataCheckException.java | 12 - .../exception/WorkImportDataException.java | 12 - .../exception/WorkNotExistsException.java | 12 - .../WorkReadLeaderInvalidException.java | 12 - .../WorkResponsibilityEmptyException.java | 12 - .../WorkResponsibilityInvalidException.java | 12 - .../schedule/ErrorIdentityCheckTask.java | 31 - .../control/schedule/St_CenterWorkCount.java | 54 - .../schedule/St_WorkReportContent.java | 32 - .../control/schedule/St_WorkReportStatus.java | 34 - .../control/schedule/WorkProgressConfirm.java | 93 - .../schedule/WorkReportCollectCreate.java | 35 - .../control/schedule/WorkReportCreate.java | 33 - .../entity/BaseWorkReportStatisticEntity.java | 88 - .../CenterWorkReportStatisticEntity.java | 37 - .../entity/WorkBaseReportSubmitEntity.java | 97 - .../WorkReportProcessOpinionEntity.java | 44 - .../ExcuteSt_WorkReportContentService.java | 298 --- .../ExcuteSt_WorkReportStatusService.java | 401 ---- .../ExcuteWorkReportCreateService.java | 99 - .../service/OkrAttachmentFileInfoService.java | 129 -- .../service/OkrCenterWorkExcuteArchive.java | 314 ---- .../service/OkrCenterWorkExcuteDelete.java | 250 --- .../service/OkrCenterWorkExcuteDeploy.java | 30 - .../service/OkrCenterWorkExcuteSave.java | 82 - .../OkrCenterWorkOperationService.java | 87 - .../service/OkrCenterWorkQueryService.java | 308 ---- .../service/OkrConfigSecretaryService.java | 178 -- .../service/OkrConfigSystemService.java | 504 ----- .../service/OkrConfigWorkLevelService.java | 119 -- .../service/OkrConfigWorkTypeService.java | 139 -- .../control/service/OkrSendNotifyService.java | 203 -- .../OkrStatisticReportContentService.java | 209 --- .../OkrStatisticReportStatusService.java | 135 -- .../OkrSystemIdentityOperatorService.java | 1126 ------------ .../OkrSystemIdentityQueryService.java | 1627 ----------------- .../service/OkrTaskHandledService.java | 61 - .../control/service/OkrTaskService.java | 748 -------- .../control/service/OkrUserInfoService.java | 271 --- .../service/OkrUserManagerService.java | 364 ---- .../service/OkrWorkAppraiseQueryService.java | 48 - .../service/OkrWorkAppraiseSyncService.java | 110 -- .../OkrWorkAuthorizeRecordService.java | 196 -- .../service/OkrWorkAuthorizeService.java | 633 ------- .../service/OkrWorkBaseInfoDeployService.java | 473 ----- .../service/OkrWorkBaseInfoExcuteArchive.java | 293 --- .../OkrWorkBaseInfoExcuteProgressAdjust.java | 95 - .../OkrWorkBaseInfoOperationService.java | 1178 ------------ .../service/OkrWorkBaseInfoQueryService.java | 1072 ----------- .../service/OkrWorkBaseInfoWfSycnService.java | 105 -- .../control/service/OkrWorkChatService.java | 215 --- .../service/OkrWorkDetailInfoService.java | 126 -- .../service/OkrWorkDynamicsService.java | 230 --- .../service/OkrWorkPersonSearchService.java | 104 -- .../control/service/OkrWorkPersonService.java | 996 ---------- .../OkrWorkProcessIdentityService.java | 119 -- .../OkrWorkReportDetailInfoService.java | 107 -- .../service/OkrWorkReportFlowService.java | 1381 -------------- .../OkrWorkReportOperationService.java | 629 ------- .../OkrWorkReportPersonLinkService.java | 252 --- .../OkrWorkReportProcessLogService.java | 216 --- .../service/OkrWorkReportQueryService.java | 217 --- .../OkrWorkReportTaskCollectService.java | 139 -- .../service/update/UpdateIdentityMap.java | 26 - .../update/UpdateOldUnitToNewUnit.java | 519 ------ .../update/UpdateOldUnitToNewUnit2.java | 985 ---------- .../service/update/UpdatePersonMap.java | 26 - .../control/service/update/UpdateUnitMap.java | 26 - .../resources/o2CodeGenerateConfig.properties | 14 - ...4\345\212\237\350\203\275\347\202\271.txt" | 33 - o2server/x_okr_core_entity/pom.xml | 129 -- .../x/okr/entity/OkrAttachmentFileInfo.java | 480 ----- .../com/x/okr/entity/OkrCenterWorkInfo.java | 760 -------- .../com/x/okr/entity/OkrConfigSecretary.java | 282 --- .../com/x/okr/entity/OkrConfigSystem.java | 227 --- .../com/x/okr/entity/OkrConfigWorkLevel.java | 134 -- .../com/x/okr/entity/OkrConfigWorkType.java | 134 -- .../x/okr/entity/OkrErrorIdentityRecords.java | 116 -- .../entity/OkrErrorSystemIdentityInfo.java | 94 - .../okr/entity/OkrStatisticReportContent.java | 510 ------ .../okr/entity/OkrStatisticReportStatus.java | 386 ---- .../main/java/com/x/okr/entity/OkrTask.java | 528 ------ .../java/com/x/okr/entity/OkrTaskHandled.java | 599 ------ .../java/com/x/okr/entity/OkrUserInfo.java | 99 - .../com/x/okr/entity/OkrWorkAppraiseInfo.java | 192 -- .../x/okr/entity/OkrWorkAuthorizeRecord.java | 492 ----- .../com/x/okr/entity/OkrWorkBaseInfo.java | 1573 ---------------- .../java/com/x/okr/entity/OkrWorkChat.java | 283 --- .../com/x/okr/entity/OkrWorkDetailInfo.java | 297 --- .../com/x/okr/entity/OkrWorkDynamics.java | 478 ----- .../java/com/x/okr/entity/OkrWorkPerson.java | 683 ------- .../x/okr/entity/OkrWorkReportBaseInfo.java | 844 --------- .../x/okr/entity/OkrWorkReportDetailInfo.java | 293 --- .../x/okr/entity/OkrWorkReportPersonLink.java | 365 ---- .../x/okr/entity/OkrWorkReportProcessLog.java | 578 ------ .../x/okr/entity/PersistenceProperties.java | 194 -- 685 files changed, 81570 deletions(-) delete mode 100644 o2server/x_okr_assemble_control/pom.xml delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/DateOperation.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/MonthOfYear.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/WeekOfYear.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2003Reader.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2007Reader.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/ExcelReaderUtil.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/IRowReader.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/UserModelEventListener.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/AbstractExcel2007Writer.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2003Writer.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2007WriterImpl.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportContentExportExcelWriter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportStatusExportExcelWriter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/XMLEncoder.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/AbstractFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ApplicationServletContextListener.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/Business.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/OkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ThisApplication.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/WebservicesClient.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessage.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessageOperator.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfReadCountGetter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfTaskCountGetter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkComplexGetter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowReaderAdder.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowStarter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrAttachmentFileInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrCenterWorkInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSecretaryFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSystemFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkLevelFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkTypeFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrErrorSystemIdentityInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportContentFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportStatusFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskHandledFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrUserInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAppraiseInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAuthorizeRecordFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkBaseInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkChatFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDetailInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDynamicsFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonSearchFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportBaseInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportDetailInfoFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportPersonLinkFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportProcessLogFactory.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/ActionApplication.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrAnonyJaxrsFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrJaxrsFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonQueryFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonSearchFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkPersonSearchFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/ActionWorkAppraiseStatusSync.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/OkrWorkAppraiseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/exception/ExceptionWorkAppraiseProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportContentExport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportStatusExport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/OkrExportAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionChangeIdentity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionErrorInfoFilterListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetErrorRecords.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetOkrErrorIdentityRecords.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionReplaceOrganWithCheckTable.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionTestReplace.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/OkrSystemErrorIdentityProcessAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecord.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecords.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionFilterIdentityEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionIdentityCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionOldIdentityEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordTypeEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionTableNameEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionGetLoginUser.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogout.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLoginAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLogoutAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionOkrSystemAdminCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserHasNoProxyIdentity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserIdentityQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserProxyQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/ActionListMindForCenterId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/OkrWorkMindAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionCenterWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionDeployedWorkListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionViewableWorkList.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownload.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownloadStream.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentUpload.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteCenterAttachment.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteReportAttachment.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteWorkAttachment.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithCenterId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithReportId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithWorkId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownload.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownloadStream.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentUpload.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownload.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownloadStream.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentUpload.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/OkrAttachmentFileInfoAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentNotExistsException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentQueryByIdException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentListByIds.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionEmptyExtension.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionInsufficientPermissions.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ReportAttachmentUploadException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/URLParameterGetException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkNotExistsException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkQueryByIdException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportNotExistsException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportQueryByIdException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkAuthorize.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkTackback.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/OkrWorkAuthorizeAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeOpinionEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeTakerIdentityEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionPersonNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigFetch.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigNotFetch.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeNotOpen.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkTackbackProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionArchive.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeleteAdmin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeploy.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDraftNewCenter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGetAdmin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilterAdmin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListOperationWithId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilterAdmin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAdminAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkArchive.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkAuditLeaderEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDeploy.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkListFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleLengthInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapIn.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCompleteDateLimitFormat.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionDeployableWorkQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionInsufficientPermissions.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrOperationDynamicSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrSystemAdminCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionSystemWorkManagerCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserUnitQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkDeploy.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkPersonQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskCreate.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskRemove.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListMySercretary.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/OkrConfigSecretaryAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetTopUnitNameByIdentity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetUnitNameByIdentity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigLeaderIdentityEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigListByIds.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionAllowedDeployWork.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGetByCode.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/OkrConfigSystemAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigCodeEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryByCode.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/OkrConfigWorkLevelAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListTypeCount.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/OkrConfigWorkTypeAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListTypeCount.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigValidate.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionCountMyTask.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListMyTaskNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListTaskCollect.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionReadProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionSendSms.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrAnonymousTaskAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAdminAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionInsufficientPermissions.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrOperationDynamicSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrSystemAdminCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonQueryByFlag.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionReadProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionSystemConfigQueryByCode.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskCountQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskInfoIsNotForRead.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskListByTaskType.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskProcessPermission.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAdminAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionInsufficientPermissions.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionOkrSystemAdminCheck.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/OkrWorkAuthorizeRecordAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionAppraise.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionArchive.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeleteForce.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeploy.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetForAdmin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetMyWorkStatistic.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetWorkOperationWithId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListAllWorkByCenterId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListDeployWorkInCenterForForm.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListProcessWorkInCenterForForm.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListSubWork.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListUsersWorkByCenterId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionProgressAdjust.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionRecycle.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionViewWork.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWfSync.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWorkCanDismantling.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAdminAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/WrapInFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionInsufficientPermissions.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportCycleInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWfWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkBaseInfoProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCanNotDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCompleteDateLimitEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCooperateInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkDetailEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkReadLeaderInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterNext.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterPrev.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/OkrWorkChatAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/OkrWorkDetailInfoAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterNext.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterPrev.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/OkrWorkDynamicsAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionDeployWorkIdsQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionViewableWorkIdsQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapInOkrWorkPerson.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapOutOkrWorkPerson.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionAutoCreateWorkReport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDispatchToOver.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDraftReport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGetFullInfo.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListByWork.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchiveNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchivePrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListNextWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListPrevWithFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveAdminSupervise.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveDraftReport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveLeaderOpinion.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmit.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitAdminSupervise.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitDraftReport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitLeaderOpinion.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAdminAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/WrapInFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseInfoEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionGetOkrUserCache.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSubmit.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionReportProcessLogList.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionSystemConfigQueryByCode.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserNoLogin.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserUnitQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportAdminProcess.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDetailQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDispatchOver.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDraftSubmit.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportLeaderSubmit.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportListByWorkId.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportMaxReportCountQuery.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSubmit.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/OkrWorkReportDetailInfoAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/OkrWorkReportPersonLinkAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportDetailWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionGet.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/OkrWorkReportProcessLogAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogNotExists.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogQueryById.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/QueueWorkDynamicRecord.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/WrapInWorkDynamic.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionDateList.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterExport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterList.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterSubList.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculate.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculateAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentExport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListByFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListDateByFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListSubByFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculate.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculateAll.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusExport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusListByFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStTreeByFilter.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportContentAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportStatusAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportContent.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportStatus.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryParentIdEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateEmpty.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryWithCondition.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcList.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcListWithIds.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcWrapOut.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionStatisticTimeInvalid.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionWrapInConvert.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/uuid/UUIDAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/ActionWorkImport.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/BaseAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportFileStatus.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportRowDetail.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/OkrWorkImportAction.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/WorkImportExcelReader.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkNotExistsException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkQueryByIdException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ExcelReadException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/GetOkrUserCacheException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/NoDataException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportCycleInvalidException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleEmptyException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleInvalidException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserNoLoginException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserUnitQueryException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitEmptyException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitFormatException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCooperateInvalidException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataCheckException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkNotExistsException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkReadLeaderInvalidException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityEmptyException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityInvalidException.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/ErrorIdentityCheckTask.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_CenterWorkCount.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportContent.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportStatus.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkProgressConfirm.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCollectCreate.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCreate.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/BaseWorkReportStatisticEntity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/CenterWorkReportStatisticEntity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkBaseReportSubmitEntity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkReportProcessOpinionEntity.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportContentService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportStatusService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteWorkReportCreateService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrAttachmentFileInfoService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteArchive.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDelete.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDeploy.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteSave.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkOperationService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkQueryService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSecretaryService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSystemService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkLevelService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkTypeService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSendNotifyService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportContentService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportStatusService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityOperatorService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityQueryService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskHandledService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrUserInfoService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrUserManagerService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseQueryService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseSyncService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeRecordService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoDeployService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteArchive.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteProgressAdjust.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoOperationService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoQueryService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoWfSycnService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkChatService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDetailInfoService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDynamicsService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonSearchService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkProcessIdentityService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportDetailInfoService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportFlowService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportOperationService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportPersonLinkService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportProcessLogService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportQueryService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportTaskCollectService.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateIdentityMap.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit2.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdatePersonMap.java delete mode 100644 o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateUnitMap.java delete mode 100644 o2server/x_okr_assemble_control/src/main/resources/o2CodeGenerateConfig.properties delete mode 100644 "o2server/x_okr_assemble_control/src/test/java/\346\234\252\345\256\214\346\210\220\347\232\204\345\212\237\350\203\275\347\202\271.txt" delete mode 100644 o2server/x_okr_core_entity/pom.xml delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrAttachmentFileInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrCenterWorkInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSecretary.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSystem.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkLevel.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkType.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorIdentityRecords.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorSystemIdentityInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportContent.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportStatus.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTask.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTaskHandled.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrUserInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAppraiseInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAuthorizeRecord.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkBaseInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkChat.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDetailInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDynamics.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkPerson.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportBaseInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportDetailInfo.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportPersonLink.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportProcessLog.java delete mode 100644 o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/PersistenceProperties.java diff --git a/o2server/pom.xml b/o2server/pom.xml index ce6288c3b0..26f69acc5d 100644 --- a/o2server/pom.xml +++ b/o2server/pom.xml @@ -29,7 +29,6 @@ x_meeting_core_entity x_message_core_entity x_mind_core_entity - x_okr_core_entity x_organization_core_entity x_portal_core_entity x_processplatform_core_entity @@ -50,7 +49,6 @@ x_meeting_assemble_control x_message_assemble_communicate x_mind_assemble_control - x_okr_assemble_control x_organization_assemble_authentication x_organization_assemble_control x_organization_assemble_express @@ -929,11 +927,6 @@ x_mind_core_entity 5 - - o2oa - x_okr_core_entity - 5 - o2oa x_organization_core_entity diff --git a/o2server/x_okr_assemble_control/pom.xml b/o2server/x_okr_assemble_control/pom.xml deleted file mode 100644 index 98c924d8ff..0000000000 --- a/o2server/x_okr_assemble_control/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - 4.0.0 - - o2oa - o2server - 5 - - x_okr_assemble_control - war - - - o2oa - x_base_core_project - - - o2oa - x_organization_core_express - - - o2oa - x_okr_core_entity - - - o2oa - x_processplatform_core_entity - - - - - - org.codehaus.mojo - exec-maven-plugin - - - describeBuilder - prepare-package - - java - - - true - true - true - com.x.base.core.project.annotation.DescribeBuilder - - ${basedir} - ${project.build.sourceDirectory} - - - - - apiBuilder - prepare-package - - java - - - true - true - true - com.x.base.core.project.annotation.ApiBuilder - - ${basedir} - ${project.build.sourceDirectory} - - - - - checkAssemble - prepare-package - - java - - - true - true - true - com.x.base.core.project.build.CheckAssemble - - - - createWebXml - prepare-package - - java - - - true - true - true - com.x.base.core.project.build.CreateWebXml - - ${basedir} - ${project.artifactId} - - - - - - - maven-resources-plugin - - - copy-war - verify - - copy-resources - - - ../store - - - target - - ${project.artifactId}.war - - - - - - - - - - diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/DateOperation.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/DateOperation.java deleted file mode 100644 index f11d23ce70..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/DateOperation.java +++ /dev/null @@ -1,1046 +0,0 @@ -package com.x.okr.assemble.common.date; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - - -public class DateOperation { - - private Logger logger = LoggerFactory.getLogger( DateOperation.class); - /** - * 根据样式得到格式化对象SimpleDateFormat - * @param date - * @param style - * @return - */ - public String getDate(Date date, String style) { - SimpleDateFormat format = new SimpleDateFormat(style); - return format.format(date); - } - - /** - * 得到某日期的日期部分 - * - * @param date - * @return yyyy-MM-dd - */ - public String getDate(Date date) { - return format1.format(date); - } - - /** - * 得到某日期的时间部分 - * - * @param date - * @return HH:mm:ss - */ - public String getTime(Date date) { - return format2.format(date); - } - - public Date getDateFromString(String dateString, String style) throws Exception{ - Date date = null; - if(style==null||"".equals(style.trim())){ - date = format1.parse(dateString); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ - date = format3.parse(dateString); - }else if( "yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())){ - date = format3_2.parse(dateString); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ - date = format3_1.parse(dateString); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ - date = format4.parse(dateString); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ - date = format1.parse(dateString); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ - date = format5.parse(dateString); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ - date = format7.parse(dateString); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ - date = format2.parse(dateString); - }else if( "HH:mm".equalsIgnoreCase(style.trim())){ - date = format2_1.parse(dateString); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！" ); - } - return date; - } - - /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 - * @param dateString - * @return - * @throws Exception - */ - public Date getDateFromString( String dateString ) throws Exception{ - Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); - return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm" ); - return date; - }catch(Exception e){} - - throw new Exception( "the style of date has error, date:" + dateString ); - } - - - public String getDateStringFromDate(Date date, String style) throws Exception{ - String dateString = null; - if(style==null||"".equals(style.trim())){ - dateString = format1.format(date); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ - dateString = format3.format(date); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ - dateString = format3_1.format(date); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ - dateString = format4.format(date); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ - dateString = format1.format(date); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ - dateString = format5.format(date); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ - dateString = format7.format(date); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ - dateString = format2.format(date); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); - } - return dateString; - } - - /** - * 得到某日期加上或减去天数后的日期,day为负数时减去 - * - * @param date - * @param month - * @return "yyyy-MM-dd" - * @throws Exception - */ - public String getDayAdd(String dateString, int day, String style) throws Exception { - Date date = getDateFromString(dateString, style); - return getDayAdd(date, day); - } - - /** - * 得到某日期加上或减去天数后的日期,day为负数时减去 - * - * @param date - * @param month - * @return "yyyy-MM-dd" - */ - public String getDayAdd(Date date, int day) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.DATE, day); - return format1.format(calendar.getTime()); - } - - /** - * 得到某日期加上或减去月份后的日期,month为负数时减去 - * - * @param date - * @param month - * @return "yyyy-MM-dd" - */ - public String getMonthAdd(Date date, int month) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.MONTH, month); - return format1.format(calendar.getTime()); - } - - /** - * 得到某日期加上或减去分钟后的日期,min为负数时减去 - * - * @param date - * @param month - * @return "yyyy-MM-dd HH:mi:ss" - */ - public String getMinutesAdd(Date date, int min) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.MINUTE, min); - return format3.format(calendar.getTime()); - } - /** - * 得到某日期的日 - * - * @param Date - * date - * @return - */ - public String getDay(Date date) { - try{ - return format10.format(date); - }catch(Exception e){ - return "0"; - } - } - public int getDayNumber(Date date) { - String result = null; - try{ - result = format10.format(date); - }catch(Exception e){ - result = "0"; - } - return Integer.parseInt(result); - } - /** - * 得到某日期的月份 - * - * @param Date - * date - * @return - */ - public String getMonth(Date date) { - try{ - return format9.format(date); - }catch(Exception e){ - return "0"; - } - } - public int getMonthNumber(Date date) { - String result = null; - try{ - result = format9.format(date); - }catch(Exception e){ - result = "0"; - } - return Integer.parseInt(result); - } - - /** - * 得到某日期的年份 - * - * @param Date - * date - * @return - */ - public String getYear( Date date ) { - try{ - return format8.format(date); - }catch(Exception e){ - return "0"; - } - } - public int getYearNumber(Date date) { - String result = null; - try{ - result = format8.format(date); - }catch(Exception e){ - result = "0"; - } - return Integer.parseInt(result); - } - /** - * 得到某日期的小时 - * - * @param Date - * date - * @return - */ - public String getHour(Date date) { - try{ - return format11.format(date); - }catch(Exception e){ - return "0"; - } - } - /** - * 得到某日期的分钟 - * - * @param Date - * date - * @return - */ - public String getMinites(Date date) { - return format12.format(date); - } - /** - * 得到某日期的秒 - * - * @param Date - * date - * @return - */ - public String getSeconds(Date date) { - return format13.format(date); - } - /** - * 得到某年有多少天 - * - * @param String - * date "yyyy-MM-dd" - * @return - * @throws ParseException - */ - @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(format1.parse(date)); - return calendar.get(calendar.DAY_OF_YEAR); - } - - /** - * 得到某年有多少天 - * - * @param Date - * date - * @return - * @throws ParseException - */ - @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar.get(calendar.DAY_OF_YEAR); - } - - /** - * 得到某年有多少天 - * - * @param String - * year "yyyy" - * @return - * @throws ParseException - */ - @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(format8.parse(year)); - return calendar.get(calendar.DAY_OF_YEAR); - } - - /** - * 得到某月有多少天 - * - * @param String - * date "yyyy-MM-dd" - * @return - * @throws ParseException - */ - public int getDaysForMonth(String date) throws ParseException { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(format1.parse(date)); - return calendar.getActualMaximum( Calendar.DAY_OF_MONTH); - } - - /** - * 得到某月有多少天 - * - * @param String - * date "yyyy-MM" - * @return - * @throws ParseException - */ - @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(format14.parse(date)); - return calendar.get(calendar.DAY_OF_MONTH); - } - - /** - * 得到某月有多少天 - * - * @param Date - * date - * @return - * @throws ParseException - */ - public int getDaysForMonth(Date date) throws ParseException { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar.get(Calendar.DAY_OF_MONTH); - } - - /** - * 得到当前的日期 - * - * @return - */ - public String getNowDate() { - return format1.format(new Date()); - } - - /** - * 得到当前的时间 - * - * @return - */ - public String getNowTime() { - return format2.format(new Date()); - } - /** - * 得到当前的时间 - * yyyyMMddHHmmss - * @return - */ - public String getNowTimeChar() { - return format7.format(new Date()); - } - /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss - * @return - */ - public String getNowDateTime() { - return format3.format(new Date()); - } - /** - * 得到两个时间之前的分差 - * @param date1 yyyy-MM-dd HH:mm:ss - * @param date2 yyyy-MM-dd HH:mm:ss - * @return - */ - public long getDeff(String date1,String date2) { - long dayNumber = 0; - // 1小时=60分钟=3600秒=3600000 - long mins = 60L * 1000L; - // long day= 24L * 60L * 60L * 1000L;计算天数之差 - SimpleDateFormat df = null; - if(date1.length() == 19){ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - }else if(date1.length() == 10){ - df = new SimpleDateFormat( "yyyy-MM-dd" ); - }else if(date1.length() == 8){ - df = new SimpleDateFormat( "HH:mm:ss" ); - }else{ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - } - try { - java.util.Date d1 = df.parse(date1); - java.util.Date d2 = df.parse(date2); - dayNumber = (d2.getTime() - d1.getTime()) / mins; - } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常" ); - logger.error(e); - } - return dayNumber; - } - /** - * 得到两个时间之前的分差 - * @param date1 yyyy-MM-dd HH:mm:ss - * @param date2 yyyy-MM-dd HH:mm:ss - * @return - */ - public long getDeff(Date date1,Date date2) { - long dayNumber = 0; - // 1小时=60分钟=3600秒=3600000 - long mins = 60L * 1000L; - // long day= 24L * 60L * 60L * 1000L;计算天数之差 - try { - dayNumber = (date2.getTime() - date1.getTime()) / mins; - } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常"); - logger.error(e); - } - return dayNumber; - } - /** - * - * 日期格式转换 - * 从YYYY-MM-DD转换到YYYYMMDD - * @param date - * @throws ParseException - */ - public String changeDateFormat(String dateString){ - Date date; - String reslut = null; - try { - if( "".equals(dateString)){ - dateString="0000-00-00"; - } - date = format1.parse(dateString); - reslut = format5.format(date); - } catch (ParseException e) { - try { - date = format1.parse( "0000-00-00" ); - } catch (ParseException e1) { - logger.warn( "系统日期格式转换发生异常"); - logger.error(e); - } - logger.warn( "系统日期格式转换发生异常" ); - logger.error(e); - } - - return reslut; - } - - /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat( "yyyy-MM-dd" ); - /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat( "HH:mm:ss" ); - public final SimpleDateFormat format2_1 = new SimpleDateFormat( "HH:mm" ); - /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - public final SimpleDateFormat format3_2 = new SimpleDateFormat( "yyyy-MM-dd HH:mm" ); - public final SimpleDateFormat format3_1 = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss" ); - /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat( "yyyy/MM/dd" ); - /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat( "yyyyMMdd" ); - /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat( "HHmmss" ); - /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat( "yyyyMMddHHmmss" ); - /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat( "yyyy" ); - /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat( "MM" ); - /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat( "dd" ); - /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat( "HH" ); - /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat( "mm" ); - /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat( "ss" ); - /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat( "yyyy-MM" ); - - - public String getStartOfWeek( String dateString ){ - SimpleDateFormat format = new SimpleDateFormat( "yyyy-MM-dd" ); - try { - Date date = format.parse(dateString); - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.setFirstDayOfWeek(Calendar.MONDAY); - int tmp = cal.get(Calendar.DAY_OF_WEEK) - 1; - if (0 == tmp) { - tmp = 7; - } - cal.add(Calendar.DATE, -(tmp-1)); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 00:00:00"; - } catch (ParseException e) { - logger.warn( "系统getStartOfWeek日期格式转换发生异常" ); - logger.error(e); - } catch (Exception e) { - logger.warn( "系统getStartOfWeek发生异常" ); - logger.error(e); - } - return null; - } - - @SuppressWarnings("unused") - public String getEndOfWeek( String dateString ){ - SimpleDateFormat format = new SimpleDateFormat( "yyyy-MM-dd" ); - try { - Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss" ); - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.setFirstDayOfWeek(Calendar.MONDAY); - cal.add(Calendar.DATE, 6); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 23:59:59"; - } catch (ParseException e) { - logger.warn( "系统getEndOfWeek日期格式转换发生异常" ); - logger.error(e); - } catch (Exception e) { - logger.warn( "系统getEndOfWeek发生异常", e); - logger.error(e); - } - return null; - } - - - - /** - * 将时间格式转换为 **月**日**时**分的格式 - * @param dateString - * @param style - * @return - * @throws Exception - */ - public String getDateCNString( String dateString, String style ) throws Exception{ - StringBuffer ch_date_string = new StringBuffer(); - Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString日期格式转换发生异常" ); - logger.error(e); - } - if(_date == null ){ - _date = new Date(); - } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - return ch_date_string.toString(); - } - - /** - * 将时间格式转换为 **月**日**时**分**秒 的格式 - * @param dateString - * @param style - * @return - * @throws Exception - */ - public String getDateCNString2( String dateString, String style ) throws Exception{ - StringBuffer ch_date_string = new StringBuffer(); - Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString2日期格式转换发生异常"); - logger.error(e); - } - if(_date == null ){ - _date = new Date(); - } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); - return ch_date_string.toString(); - } - - - - - - /** - * 判断是否周末 - * @param recordDate - * @return - */ - public boolean isWeekend(Date date) { - Calendar cal = Calendar.getInstance(); - cal.setTime( date ); - if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){ - return true; - } - return false; - } - - @SuppressWarnings("unused") - public long getMinutes( Date date1, Date data2){ - long l=data2.getTime()-date1.getTime(); - long day=l/(24*60*60*1000); - long hour=(l/(60*60*1000)); - long min=((l/(60*1000))); - return min; - } - - /** - * 根据提供的年份月份，获取当月所有的日期字符串：yyyy-mm-dd - * @param s_year - * @param _month - * @return - */ - public List getDateStringFormMonth(String s_year, String _month) { - List result = new ArrayList(); - Calendar cal = Calendar.getInstance(); - int year = 0; - int month = 0; - int days = 0; - try{ - year = Integer.parseInt( s_year ); - }catch(Exception e){ - e.printStackTrace(); - } - try{ - month = Integer.parseInt( _month ); - }catch(Exception e){ - e.printStackTrace(); - } - cal.set(year, month-1, 1); - days = cal.getActualMaximum(Calendar.DATE); - for( int i =1; i<= days ; i++){ - result.add( s_year + "-" + (month<10?"0"+month:month) + "-" + (i<10?"0"+i:i)); - } - return result; - } - - /** - * 根据提供的两个时间之间所有的日期字符串：yyyy-mm-dd - * @param startDate - * @param endDate - * @return - * @throws Exception - */ - public List listDateStringBetweenDate( Date startDate, Date endDate ) throws Exception { - List result = new ArrayList(); - Calendar cal = Calendar.getInstance(); - startDate = getDateFromString( getDateStringFromDate( startDate, "yyyy-MM-dd" ) ); - endDate = getDateFromString( getDateStringFromDate( endDate, "yyyy-MM-dd" ) + " 23:59:59" ); - cal.setTime( startDate ); - while( cal.getTime().before(endDate)){ - //logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); - result.add( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" )); - cal.add(Calendar.DATE, 1); - } - return result; - } - /** - * 获取日期所在月份的第一天 - * @param recordDate - * @return - * @throws Exception - */ - public Date getFirstDateInMonth(Date recordDate) throws Exception { - String year = format8.format(recordDate); - String month = format9.format(recordDate); - return getDateFromString( year + "-" + month + "-01" ); - } - - /** - * 获取日期所在月份的第一天 - * @param recordDate yyyy-MM-dd - * @return - * @throws Exception - */ - public String getFirstDateStringInMonth(Date recordDate) throws Exception { - String year = format8.format(recordDate); - String month = format9.format(recordDate); - return year + "-" + month + "-01"; - } - - /** - * 获取当月的最后一日 - * @param date - * @return - */ - public static Date getLastDayOfMonth(Date date) { - Calendar calendar = convert(date); - calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); - return calendar.getTime(); - } - /** - * 将日期转换为日历 - * @param date 日期 - * @return 日历 - */ - private static Calendar convert(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar; - } - /** - * 获取日期所在月份的第一天 - * @param recordDate - * @return - * @throws Exception - */ - public Date getLastDateInMonth(Date recordDate) throws Exception { - Date lastDate = getLastDayOfMonth(recordDate); - return getDateFromString( getDateStringFromDate( lastDate, "yyyy-MM-dd" ) ); - } - - /** - * 获取日期所在月份的第一天 - * @param recordDate yyyy-MM-dd - * @return - * @throws Exception - */ - public String getLastDateStringInMonth(Date recordDate) throws Exception { - Date lastDate = getLastDayOfMonth(recordDate); - return getDateStringFromDate( lastDate, "yyyy-MM-dd" ); - } - - public static Integer getWeekOfYear(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setFirstDayOfWeek(Calendar.MONDAY); - calendar.setTime(date); - int week = calendar.get(Calendar.WEEK_OF_YEAR); - int mouth = calendar.get(Calendar.MONTH); - // JDK think 2015-12-31 as 2016 1th week - //如果月份是12月，且求出来的周数是第一周，说明该日期实质上是这一年的第53周，也是下一年的第一周 - if (mouth >= 11 && week <= 1) { - week += 52; - } - return week; - } - - public static Integer getYearOfDate(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar.get(Calendar.YEAR); - } - - public static Integer weeksBetween(Date fromDate, Date toDate) { - if (fromDate.before(toDate)) { - Date temp = fromDate; - fromDate = toDate; - toDate = temp; - } - Integer weekNum = (getWeekOfYear(fromDate) - getWeekOfYear(toDate)) - + (getYearOfDate(fromDate) - getYearOfDate(toDate)) * 52; - return ++weekNum; - } - - /** - * 获取日期在一年中的周数 - * 结果从1开始 - * @param dateString yyyy-mm-dd - * @return - */ - public int getWeekNumOfYear( String dateString ){ - try { - Date date = getDateFromString( dateString , "yyyy-MM-dd" ); - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); - } catch (ParseException e) { - logger.warn( "系统getWeekNumOfYear日期格式转换发生异常" ); - logger.error(e); - } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常" ); - logger.error(e); - } - return -1; - } - - /** - * 获取日期在一年中的周数 - * 结果从1开始 - * @param dateString yyyy-mm-dd - * @return - */ - public int getWeekNumOfYear( Date date ){ - try { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); - } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常" ); - logger.error(e); - } - return -1; - } - - /** - * 计算两个日期之间的周数及详细情况 - * @param startDateString - * @param endDateString - * @return - */ - public List getWeeksOfYear( String startDateString, String endDateString ){ - try { - Date startDate = getDateFromString( startDateString ); - Date endDate = getDateFromString( endDateString ); - return getWeeksOfYear( startDate, endDate ); - } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常" ); - logger.error(e); - } - return null; - } - - /** - * 计算两个日期之间的周数及详细情况 - * @param startDateString - * @param endDateString - * @return - */ - public List getMonthsOfYear( String startDateString, String endDateString ){ - try { - Date startDate = getDateFromString( startDateString ); - Date endDate = getDateFromString( endDateString ); - return getMonthsOfYear( startDate, endDate ); - } catch (Exception e) { - logger.warn( "系统getMonthsOfYear发生异常" ); - logger.error(e); - } - return null; - } - - public List getMonthsOfYear( Date startDate, Date endDate ) { - List monthOfYearList = new ArrayList<>(); - MonthOfYear monthOfYear = null; - String monthStartDateString = null; - String monthEndDateString = null; - int year = 0; - int month = 0; - try { - Calendar cal = Calendar.getInstance(); - cal.setTime( startDate ); - - year = cal.get( Calendar.YEAR ); - month = cal.get( Calendar.MONTH ); - cal.set( year, month, 1 ); - do{ - cal.set( Calendar.HOUR_OF_DAY, 0 ); - cal.set( Calendar.MINUTE, 0 ); - cal.set( Calendar.SECOND, 0 ); - cal.set( Calendar.MILLISECOND, 0 ); - monthOfYear = new MonthOfYear(); - monthOfYear.setMonth( month + 1 ); - monthOfYear.setYear( year ); - - monthStartDateString = getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ); - monthOfYear.setStartDate( cal.getTime() ); - monthOfYear.setStartDateString( monthStartDateString ); - - cal.add( Calendar.MONTH, 1 ); - cal.add( Calendar.DAY_OF_MONTH, -1 ); - - cal.set( Calendar.HOUR_OF_DAY, 23 ); - cal.set( Calendar.MINUTE, 59 ); - cal.set( Calendar.SECOND, 59 ); - cal.set( Calendar.MILLISECOND, 0 ); - monthEndDateString = getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ); - monthOfYear.setEndDate( cal.getTime() ); - monthOfYear.setEndDateString( monthEndDateString ); - monthOfYearList.add( monthOfYear ); - - cal.set( year, month, 1 ); - cal.add( Calendar.MONTH, 1 ); - year = cal.get( Calendar.YEAR ); - month = cal.get( Calendar.MONTH ); - - }while( cal.getTime().before( endDate ) ); - } catch (Exception e) { - logger.warn( "系统getMonthsOfYear发生异常" ); - logger.error(e); - } - return monthOfYearList; - } - - /** - * 计算两个日期之间的周数及详细情况 - * @param startDate - * @param endDate - * @return - */ - public List getWeeksOfYear( Date startDate, Date endDate ){ - List weekOfYearList = new ArrayList<>(); - WeekOfYear weekOfYear = null; - String weekStartDateString = null; - String weekEndDateString = null; - int year = 0; - int weekNo = 0; - int day_of_week = 0; - try { - Calendar cal = Calendar.getInstance(); - cal.setTime( startDate ); - day_of_week = cal.get( Calendar.DAY_OF_WEEK ) - 1; - //找出初始周的第一天 - while( day_of_week != 1 ){ - cal.add(Calendar.DATE, -1); - day_of_week = cal.get( Calendar.DAY_OF_WEEK ) - 1; - } - do{ - cal.set( Calendar.HOUR_OF_DAY, 0 ); - cal.set( Calendar.MINUTE, 0 ); - cal.set( Calendar.SECOND, 0 ); - cal.set( Calendar.MILLISECOND, 0 ); - weekOfYear = new WeekOfYear(); - year = cal.get( Calendar.YEAR ); - weekNo = getWeekNumOfYear( cal.getTime() ); - weekOfYear.setWeekNo( weekNo ); - weekOfYear.setYear( year ); - weekStartDateString = getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ); - weekOfYear.setStartDate( cal.getTime() ); - weekOfYear.setStartDateString( weekStartDateString ); - - cal.add(Calendar.DATE, 6 ); - weekEndDateString = getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ); - year = cal.get( Calendar.YEAR ); - if( year > weekOfYear.getYear() ){ - //跨年了,取后一年的 - if( weekOfYear.getWeekNo() == 1 ){ - weekOfYear.setYear( year ); - } - } - - cal.set( Calendar.HOUR_OF_DAY, 23 ); - cal.set( Calendar.MINUTE, 59 ); - cal.set( Calendar.SECOND, 59 ); - cal.set( Calendar.MILLISECOND, 0 ); - weekOfYear.setEndDate( cal.getTime() ); - weekOfYear.setEndDateString( weekEndDateString ); - weekOfYearList.add( weekOfYear ); - cal.add(Calendar.DATE, 1 ); - }while( cal.getTime().before( endDate ) ); - } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常" ); - logger.error(e); - } - return weekOfYearList; - } - - public static void main(String[] args) throws Exception{ - List list = new DateOperation().getMonthsOfYear( "2016-01-01","2016-12-07" ); - for( MonthOfYear enitty : list ){ - System.out.println( enitty.toString() ); - } - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/MonthOfYear.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/MonthOfYear.java deleted file mode 100644 index b1b2c30163..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/MonthOfYear.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.common.date; - -import java.util.Date; - -public class MonthOfYear { - - private Date startDate = null; - - private Date endDate = null; - - private String startDateString = null; - - private String endDateString = null; - - private Integer month = 1; - - private Integer year = 1; - - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public String getStartDateString() { - return startDateString; - } - - public void setStartDateString(String startDateString) { - this.startDateString = startDateString; - } - - public String getEndDateString() { - return endDateString; - } - - public void setEndDateString(String endDateString) { - this.endDateString = endDateString; - } - - public Integer getMonth() { - return month; - } - - public void setMonth(Integer month) { - this.month = month; - } - - public Integer getYear() { - return year; - } - - public void setYear(Integer year) { - this.year = year; - } - - public String toString(){ - return this.year + "年" +this.month + "月:" + this.startDateString + " -- " + this.endDateString; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/WeekOfYear.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/WeekOfYear.java deleted file mode 100644 index e9ba837c37..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/date/WeekOfYear.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.common.date; - -import java.util.Date; - -public class WeekOfYear { - - private Date startDate = null; - - private Date endDate = null; - - private String startDateString = null; - - private String endDateString = null; - - private Integer weekNo = 1; - - private Integer year = 1; - - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public String getStartDateString() { - return startDateString; - } - - public void setStartDateString(String startDateString) { - this.startDateString = startDateString; - } - - public String getEndDateString() { - return endDateString; - } - - public void setEndDateString(String endDateString) { - this.endDateString = endDateString; - } - - public Integer getWeekNo() { - return weekNo; - } - - public void setWeekNo(Integer weekNo) { - this.weekNo = weekNo; - } - - public Integer getYear() { - return year; - } - - public void setYear(Integer year) { - this.year = year; - } - - public String toString(){ - return this.year + "年第"+this.weekNo + "周:" + this.startDateString + " -- " + this.endDateString; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2003Reader.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2003Reader.java deleted file mode 100644 index 1cb0c18b43..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2003Reader.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.x.okr.assemble.common.excel.reader; - -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener; -import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener; -import org.apache.poi.hssf.eventusermodel.HSSFEventFactory; -import org.apache.poi.hssf.eventusermodel.HSSFListener; -import org.apache.poi.hssf.eventusermodel.HSSFRequest; -import org.apache.poi.hssf.eventusermodel.MissingRecordAwareHSSFListener; -import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord; -import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord; -import org.apache.poi.hssf.model.HSSFFormulaParser; -import org.apache.poi.hssf.record.BOFRecord; -import org.apache.poi.hssf.record.BlankRecord; -import org.apache.poi.hssf.record.BoolErrRecord; -import org.apache.poi.hssf.record.BoundSheetRecord; -import org.apache.poi.hssf.record.FormulaRecord; -import org.apache.poi.hssf.record.LabelRecord; -import org.apache.poi.hssf.record.LabelSSTRecord; -import org.apache.poi.hssf.record.NumberRecord; -import org.apache.poi.hssf.record.Record; -import org.apache.poi.hssf.record.SSTRecord; -import org.apache.poi.hssf.record.StringRecord; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; - -/** - * 抽象Excel2003读取器，通过实现HSSFListener监听器，采用事件驱动模式解析excel2003 - * 中的内容，遇到特定事件才会触发，大大减少了内存的使用。 - * - */ -public class Excel2003Reader implements HSSFListener{ - private int minColumns = -1; - private POIFSFileSystem fs; - private int lastRowNumber; - private int lastColumnNumber; - - /** Should we output the formula, or the value it has? */ - private boolean outputFormulaValues = true; - - /** For parsing Formulas */ - private SheetRecordCollectingListener workbookBuildingListener; - //excel2003工作薄 - private HSSFWorkbook stubWorkbook; - - // Records we pick up as we process - private SSTRecord sstRecord; - private FormatTrackingHSSFListener formatListener; - - //表索引 - private int sheetIndex = -1; - private BoundSheetRecord[] orderedBSRs; - @SuppressWarnings("rawtypes") - private ArrayList boundSheetRecords = new ArrayList(); - - // For handling formulas with string results - private int nextRow; - private int nextColumn; - private boolean outputNextStringRecord; - //当前行 - private int curRow = 0; - //存储行记录的容器 - private List rowlist = new ArrayList();; - @SuppressWarnings( "unused" ) - private String sheetName; - - private String fileKey; - private int startRow; - private IRowReader rowReader; - - - public void setRowReader(IRowReader rowReader, String fileKey, int startRow ){ - this.rowReader = rowReader; - this.fileKey = fileKey; - this.startRow = startRow; - } - - /** - * 遍历excel下所有的sheet - * @param fileKey - * @throws IOException - */ - public void process( String fileName ) throws IOException { - - this.fs = new POIFSFileSystem( new FileInputStream(fileName) ); - MissingRecordAwareHSSFListener listener = new MissingRecordAwareHSSFListener( this); - formatListener = new FormatTrackingHSSFListener(listener); - HSSFEventFactory factory = new HSSFEventFactory(); - HSSFRequest request = new HSSFRequest(); - if ( outputFormulaValues ) { - request.addListenerForAllRecords( formatListener ); - } else { - workbookBuildingListener = new SheetRecordCollectingListener( formatListener); - request.addListenerForAllRecords(workbookBuildingListener); - } - factory.processWorkbookEvents(request, fs); - //数据读取完成 - - } - - /** - * 遍历excel下所有的sheet - * @param fileKey - * @throws IOException - */ - public void process( InputStream is ) throws IOException { - this.fs = new POIFSFileSystem( is ); - MissingRecordAwareHSSFListener listener = new MissingRecordAwareHSSFListener( this); - formatListener = new FormatTrackingHSSFListener(listener); - HSSFEventFactory factory = new HSSFEventFactory(); - HSSFRequest request = new HSSFRequest(); - if ( outputFormulaValues ) { - request.addListenerForAllRecords( formatListener ); - } else { - workbookBuildingListener = new SheetRecordCollectingListener( formatListener); - request.addListenerForAllRecords(workbookBuildingListener); - } - factory.processWorkbookEvents(request, fs); - //数据读取完成 - - } - - /** - * HSSFListener 监听方法，处理 Record - */ - @SuppressWarnings( "unchecked" ) - public void processRecord(Record record) { - int thisRow = -1; - int thisColumn = -1; - String thisStr = null; - String value = null; - switch (record.getSid()) { - case BoundSheetRecord.sid: - boundSheetRecords.add(record); - break; - case BOFRecord.sid: - BOFRecord br = (BOFRecord) record; - if (br.getType() == BOFRecord.TYPE_WORKSHEET) { - // 如果有需要，则建立子工作薄 - if (workbookBuildingListener != null && stubWorkbook == null) { - stubWorkbook = workbookBuildingListener - .getStubHSSFWorkbook(); - } - - sheetIndex++; - if (orderedBSRs == null) { - orderedBSRs = BoundSheetRecord - .orderByBofPosition(boundSheetRecords); - } - sheetName = orderedBSRs[sheetIndex].getSheetname(); - } - break; - - case SSTRecord.sid: - sstRecord = (SSTRecord) record; - break; - - case BlankRecord.sid: - BlankRecord brec = (BlankRecord) record; - thisRow = brec.getRow(); - thisColumn = brec.getColumn(); - thisStr = ""; - rowlist.add(thisColumn, thisStr); - break; - case BoolErrRecord.sid: //单元格为布尔类型 - BoolErrRecord berec = (BoolErrRecord) record; - thisRow = berec.getRow(); - thisColumn = berec.getColumn(); - thisStr = berec.getBooleanValue()+""; - rowlist.add(thisColumn, thisStr); - break; - - case FormulaRecord.sid: //单元格为公式类型 - FormulaRecord frec = (FormulaRecord) record; - thisRow = frec.getRow(); - thisColumn = frec.getColumn(); - if (outputFormulaValues) { - if (Double.isNaN(frec.getValue())) { - // Formula result is a string - // This is stored in the next record - outputNextStringRecord = true; - nextRow = frec.getRow(); - nextColumn = frec.getColumn(); - } else { - thisStr = formatListener.formatNumberDateCell(frec); - } - } else { - thisStr = '"' + HSSFFormulaParser.toFormulaString(stubWorkbook, frec.getParsedExpression()) + '"'; - } - rowlist.add(thisColumn,thisStr); - break; - case StringRecord.sid://单元格中公式的字符串 - if (outputNextStringRecord) { - // String for formula - StringRecord srec = (StringRecord) record; - thisStr = srec.getString(); - thisRow = nextRow; - thisColumn = nextColumn; - outputNextStringRecord = false; - } - break; - case LabelRecord.sid: - LabelRecord lrec = (LabelRecord) record; - curRow = thisRow = lrec.getRow(); - thisColumn = lrec.getColumn(); - value = lrec.getValue().trim(); - value = value.equals( "" )?" ":value; - this.rowlist.add(thisColumn, value); - break; - case LabelSSTRecord.sid: //单元格为字符串类型 - LabelSSTRecord lsrec = (LabelSSTRecord) record; - curRow = thisRow = lsrec.getRow(); - thisColumn = lsrec.getColumn(); - if (sstRecord == null) { - rowlist.add(thisColumn, " " ); - } else { - value = sstRecord - .getString(lsrec.getSSTIndex()).toString().trim(); - value = value.equals( "" )?" ":value; - rowlist.add(thisColumn,value); - } - break; - case NumberRecord.sid: //单元格为数字类型 - NumberRecord numrec = (NumberRecord) record; - curRow = thisRow = numrec.getRow(); - thisColumn = numrec.getColumn(); - value = formatListener.formatNumberDateCell(numrec).trim(); - value = value.equals( "" )?" ":value; - // 向容器加入列值 - rowlist.add(thisColumn, value); - break; - default: - break; - } - - // 遇到新行的操作 - if (thisRow != -1 && thisRow != lastRowNumber) { - lastColumnNumber = -1; - } - - // 空值的操作 - if (record instanceof MissingCellDummyRecord) { - MissingCellDummyRecord mc = (MissingCellDummyRecord) record; - curRow = thisRow = mc.getRow(); - thisColumn = mc.getColumn(); - rowlist.add(thisColumn," " ); - } - - // 更新行和列的值 - if (thisRow > -1) - lastRowNumber = thisRow; - if (thisColumn > -1) - lastColumnNumber = thisColumn; - - // 行结束时的操作 - if (record instanceof LastCellOfRowDummyRecord) { - if (minColumns > 0) { - // 列值重新置空 - if (lastColumnNumber == -1) { - lastColumnNumber = 0; - } - } - lastColumnNumber = -1; - // 每行结束时， 调用getRows() 方法 - - rowReader.getRows(sheetIndex,curRow, rowlist, this.fileKey, this.startRow ); - - // 清空容器 - rowlist.clear(); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2007Reader.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2007Reader.java deleted file mode 100644 index b3d9bbddb6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/Excel2007Reader.java +++ /dev/null @@ -1,232 +0,0 @@ -package com.x.okr.assemble.common.excel.reader; - -import java.io.InputStream; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import org.apache.poi.hssf.usermodel.HSSFDateUtil; -import org.apache.poi.openxml4j.opc.OPCPackage; -import org.apache.poi.xssf.eventusermodel.XSSFReader; -import org.apache.poi.xssf.model.SharedStringsTable; -import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.helpers.XMLReaderFactory; - -/** - * 抽象Excel2007读取器，excel2007的底层数据结构是xml文件，采用SAX的事件驱动的方法解析 - * xml，需要继承DefaultHandler，在遇到文件内容时，事件会触发，这种做法可以大大降低 - * 内存的耗费，特别使用于大数据量的文件。 - * - */ -public class Excel2007Reader extends DefaultHandler { - //共享字符串表 - private SharedStringsTable sst; - //上一次的内容 - private String lastContents; - - private boolean nextIsString; - - private int sheetIndex = -1; - - private List rowlist = new ArrayList(); - //当前行 - private int curRow = 0; - //当前列 - private int curCol = 0; - //日期标志 - private boolean dateFlag; - //数字标志 - private boolean numberFlag; - - private boolean isTElement; - - private String fileKey; - private int startRow; - private IRowReader rowReader; - - public void setRowReader(IRowReader rowReader, String fileKey, int startRow){ - this.rowReader = rowReader; - this.fileKey = fileKey; - this.startRow = startRow; - } - - /**只遍历一个电子表格，其中sheetId为要遍历的sheet索引，从1开始，1-3 - * @param filename - * @param sheetId - * @throws Exception - */ - public void processOneSheet(String filename,int sheetId) throws Exception { - OPCPackage pkg = OPCPackage.open(filename); - XSSFReader r = new XSSFReader(pkg); - SharedStringsTable sst = r.getSharedStringsTable(); - XMLReader parser = fetchSheetParser(sst); - - // 根据 rId# 或 rSheet# 查找sheet - InputStream sheet2 = r.getSheet( "rId"+sheetId); - sheetIndex++; - InputSource sheetSource = new InputSource(sheet2); - parser.parse(sheetSource); - sheet2.close(); - } - - /** - * 遍历工作簿中所有的电子表格 - * @param filename - * @param fileKey - * @throws Exception - */ - public void process( String filename ) throws Exception { - OPCPackage pkg = OPCPackage.open( filename ); - XSSFReader r = new XSSFReader(pkg); - SharedStringsTable sst = r.getSharedStringsTable(); - XMLReader parser = fetchSheetParser(sst); - Iterator sheets = r.getSheetsData(); - while (sheets.hasNext()) { - curRow = 0; - sheetIndex++; - InputStream sheet = sheets.next(); - InputSource sheetSource = new InputSource(sheet); - parser.parse( sheetSource ); - sheet.close(); - } - //数据读取完成 - } - /** - * 遍历工作簿中所有的电子表格 - * @param is - * @param fileKey - * @throws Exception - */ - public void process( InputStream is ) throws Exception { - OPCPackage pkg = OPCPackage.open( is ); - XSSFReader r = new XSSFReader(pkg); - SharedStringsTable sst = r.getSharedStringsTable(); - XMLReader parser = fetchSheetParser(sst); - Iterator sheets = r.getSheetsData(); - while (sheets.hasNext()) { - curRow = 0; - sheetIndex++; - InputStream sheet = sheets.next(); - InputSource sheetSource = new InputSource(sheet); - parser.parse( sheetSource ); - sheet.close(); - } - //数据读取完成 - } - public XMLReader fetchSheetParser(SharedStringsTable sst) throws SAXException { - XMLReader parser = XMLReaderFactory.createXMLReader( "org.apache.xerces.parsers.SAXParser" ); - this.sst = sst; - parser.setContentHandler(this); - return parser; - } - - public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException { - - // c => 单元格 - if ( "c".equals(name)) { - // 如果下一个元素是 SST 的索引，则将nextIsString标记为true - String cellType = attributes.getValue( "t" ); - if ( "s".equals(cellType)) { - nextIsString = true; - } else { - nextIsString = false; - } - //日期格式 - String cellDateType = attributes.getValue( "s" ); - if ( "1".equals(cellDateType)){ - dateFlag = true; - } else { - dateFlag = false; - } - String cellNumberType = attributes.getValue( "s" ); - if( "2".equals(cellNumberType)){ - numberFlag = true; - } else { - numberFlag = false; - } - - } - //当元素为t时 - if( "t".equals(name)){ - isTElement = true; - } else { - isTElement = false; - } - - // 置空 - lastContents = ""; - } - - public void endElement(String uri, String localName, String name) - throws SAXException { - - // 根据SST的索引值的到单元格的真正要存储的字符串 - // 这时characters()方法可能会被调用多次 - if (nextIsString) { - try { - int idx = Integer.parseInt(lastContents); - lastContents = new XSSFRichTextString(sst.getEntryAt(idx)) - .toString(); - } catch (Exception e) { - - } - } - //t元素也包含字符串 - if(isTElement){ - String value = lastContents.trim(); - rowlist.add(curCol, value); - curCol++; - isTElement = false; - // v => 单元格的值，如果单元格是字符串则v标签的值为该字符串在SST中的索引 - // 将单元格内容加入rowlist中，在这之前先去掉字符串前后的空白符 - } else if ( "v".equals(name)) { - String value = lastContents.trim(); - value = value.equals( "" )?" ":value; - //日期格式处理 - if(dateFlag){ - try{ - Date date = HSSFDateUtil.getJavaDate(Double.valueOf(value)); - SimpleDateFormat dateFormat = new SimpleDateFormat( "dd/MM/yyyy" ); - value = dateFormat.format(date); - }catch(Exception e){ - - } - } - //数字类型处理 - if(numberFlag){ - try{ - BigDecimal bd = new BigDecimal(value); - value = bd.setScale(3,BigDecimal.ROUND_UP).toString(); - }catch(Exception e){ - - } - } - rowlist.add(curCol, value); - curCol++; - }else { - //如果标签名称为 row ，这说明已到行尾，调用 optRows() 方法 - if (name.equals( "row" )) { - - rowReader.getRows(sheetIndex,curRow,rowlist, this.fileKey, this.startRow ); - rowlist.clear(); - curRow++; - curCol = 0; - } - } - - } - - public void characters(char[] ch, int start, int length) - throws SAXException { - //得到单元格内容的值 - lastContents += new String(ch, start, length); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/ExcelReaderUtil.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/ExcelReaderUtil.java deleted file mode 100644 index cb8f931dca..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/ExcelReaderUtil.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.x.okr.assemble.common.excel.reader; - -import java.io.InputStream; - -public class ExcelReaderUtil { - - //excel2003扩展名 - public static final String EXCEL03_EXTENSION = ".xls"; - //excel2007扩展名 - public static final String EXCEL07_EXTENSION = ".xlsx"; - - /** - * 读取Excel文件，可能是03也可能是07版本 - * @param excel03 - * @param excel07 - * @param fileName - * @throws Exception - */ - public static void readExcel(IRowReader reader, String fileName, String fileKey, int startRow ) throws Exception{ - // 处理excel2003文件 - if (fileName.endsWith(EXCEL03_EXTENSION)){ - Excel2003Reader excel03 = new Excel2003Reader(); - excel03.setRowReader(reader, fileKey, startRow); - excel03.process(fileName); - // 处理excel2007文件 - } else if (fileName.endsWith(EXCEL07_EXTENSION)){ - Excel2007Reader excel07 = new Excel2007Reader(); - excel07.setRowReader(reader, fileKey, startRow); - excel07.process(fileName); - } else { - throw new Exception( "文件格式错误，fileName的扩展名只能是xls或xlsx。" ); - } - } - - /** - * 读取Excel文件，可能是03也可能是07版本 - * @param excel03 - * @param excel07 - * @param fileName - * @throws Exception - */ - public static void readExcel(IRowReader reader,String fileName, InputStream inputStream, String fileKey, int startRow ) throws Exception{ - // 处理excel2003文件 - if (fileName.endsWith( EXCEL03_EXTENSION )){ - Excel2003Reader excel03 = new Excel2003Reader(); - excel03.setRowReader(reader, fileKey, startRow); - excel03.process(inputStream); - // 处理excel2007文件 - } else if (fileName.endsWith(EXCEL07_EXTENSION)){ - Excel2007Reader excel07 = new Excel2007Reader(); - excel07.setRowReader(reader, fileKey, startRow); - excel07.process(inputStream); - } else { - throw new Exception( "文件格式错误，fileName的扩展名只能是xls或xlsx。" ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/IRowReader.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/IRowReader.java deleted file mode 100644 index 402b0b6ecd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/IRowReader.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.common.excel.reader; - -import java.util.List; - -public interface IRowReader { - - /**业务逻辑实现方法 - * @param sheetIndex - * @param curRow - * @param rowlist - */ - public void getRows( int sheetIndex, int curRow, List rowlist, String fileKey, int startRow ); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/UserModelEventListener.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/UserModelEventListener.java deleted file mode 100644 index d47ba125c8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/reader/UserModelEventListener.java +++ /dev/null @@ -1,219 +0,0 @@ -package com.x.okr.assemble.common.excel.reader; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener; -import org.apache.poi.hssf.eventusermodel.HSSFListener; -import org.apache.poi.hssf.record.BOFRecord; -import org.apache.poi.hssf.record.BlankRecord; -import org.apache.poi.hssf.record.BoolErrRecord; -import org.apache.poi.hssf.record.BoundSheetRecord; -import org.apache.poi.hssf.record.FormulaRecord; -import org.apache.poi.hssf.record.LabelSSTRecord; -import org.apache.poi.hssf.record.NumberRecord; -import org.apache.poi.hssf.record.RowRecord; -import org.apache.poi.hssf.record.SSTRecord; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - - -/** - * 基于POI HSSF的eventmodel 模型的时间解析方式 - * 优点：解析数据相当快。 - * 缺点：1.仅仅支持97~2003版本的excel，不支持2007版本的excel。 - * 2.只能读Excel中一个Sheet页面。 - * - * @Title: - * @Description: 实现TODO - * @Copyright:Copyright (c) 2011 - * @Date:2012-6-14 - * @author longgangbai - * @version 1.0 - */ -public class UserModelEventListener implements HSSFListener { - private static Logger logger=LoggerFactory.getLogger(UserModelEventListener.class); - private SSTRecord sstrec; - /** Should we output the formula, or the value it has? */ - @SuppressWarnings("unused") - private boolean outputFormulaValues = true; - /** For parsing Formulas */ - @SuppressWarnings("unused") - private SheetRecordCollectingListener workbookBuildingListener; - - //当前Sheet的内容 - private List> currentSheetDataMap=new ArrayList>(); - //列对应的字段 - private static String[] trianListheadTitle=new String[]{"trainCode","firstStation","lastStation","startStation","arriveStation","startTime","arriveTime","fistLevelPrice","secondLevelPrice","km","useDate"}; - - //一行记录 - private Map currentSheetRowDataMap=new HashMap(); - private int curRowNum=0; - private int ignoreRowNum=1; - @SuppressWarnings("unused") - private int sheetNo=0; - - @SuppressWarnings({ "static-access", "unused" }) - @Override - public void processRecord(org.apache.poi.hssf.record.Record record) { - switch (record.getSid()) { - - case BOFRecord.sid: - BOFRecord bof = (BOFRecord) record; - //顺序进入新的Workbook - if (bof.getType() == bof.TYPE_WORKBOOK) { - //logger.debug( "开始解析excel 文档....." ); - //顺序进入新的Worksheet，因为Event API不会把Excel文件里的所有数据结构都关联起来， - //所以这儿一定要记录现在进入第几个sheet了。 - } else if (bof.getType() == bof.TYPE_WORKSHEET) { - //读取新的一个Sheet页 - //logger.debug( "开始解析sheet页面内容..." ); - //System.out.println( "sheetNo="+sheetNo); - sheetNo++; - currentSheetDataMap=new ArrayList>(); - } - break; - //开始解析Sheet的信息，记录sheet，这儿会把所有的sheet都顺序打印出来，如果有多个sheet的话，可以顺序记入到一个List里 - case BoundSheetRecord.sid: - BoundSheetRecord bsr = (BoundSheetRecord) record; - //System.out.println( "sheetName="+bsr.getSheetname()); - //logger.debug( "New sheet named: " + bsr.getSheetname()); - break; - //执行行记录事件 - case RowRecord.sid: - RowRecord rowrec = (RowRecord) record; - //logger.debug( "记录开始, first column at " - // + rowrec.getFirstCol() + " last column at " - // + rowrec.getLastCol()); - break; - // SSTRecords store a array of unique strings used in Excel. - case SSTRecord.sid: - sstrec = (SSTRecord) record; - for (int k = 0; k < sstrec.getNumUniqueStrings(); k++) { - //logger.debug( "String table value " + k + " = " - // + sstrec.getString(k)); - } - break; - - //发现数字类型的cell，因为数字和日期都是用这个格式，所以下面一定要判断是不是日期格式，另外默认的数字也会被视为日期格式，所以如果是数字的话，一定要明确指定格式！！！！！！！ - case NumberRecord.sid: - NumberRecord nr = (NumberRecord) record; - //HSSFDateUtil.isInternalDateFormat(nr.getXFIndex()) 判断是否为时间列 - int column=nr.getColumn(); - if(column==5||column==6){ - addDataAndrChangeRow(nr.getRow(),nr.getColumn(),getTime(nr.getValue())); - }else{ - addDataAndrChangeRow(nr.getRow(),nr.getColumn(),(int)nr.getValue()); - } - break; - //发现字符串类型，这儿要取字符串的值的话，跟据其index去字符串表里读取 - case LabelSSTRecord.sid: - LabelSSTRecord lsr = (LabelSSTRecord)record; - addDataAndrChangeRow(lsr.getRow(),lsr.getColumn(), sstrec.getString(lsr.getSSTIndex())); - //logger.debug( "文字列:"+sstrec.getString(lsr.getSSTIndex())+",　行："+lsr.getRow()+", 列："+lsr.getColumn()); - break; - case BoolErrRecord.sid: //解析boolean错误信息 - BoolErrRecord ber = (BoolErrRecord)record; - if(ber.isBoolean()){ - addDataAndrChangeRow(ber.getRow(),ber.getColumn(), ber.getBooleanValue()); - //logger.debug( "Boolean:"+ber.getBooleanValue()+", 行："+ber.getRow()+", 列："+ber.getColumn()); - } - if(ber.isError()){ - //logger.debug( "Error:"+ber.getErrorValue()+", 行："+ber.getRow()+", 列："+ber.getColumn()); - } - break; - //空白记录的信息 - case BlankRecord.sid: - BlankRecord br = (BlankRecord)record; - addDataAndrChangeRow(br.getRow(),br.getColumn(), "" ); - //logger.debug( "空。　行："+br.getRow()+", 列："+br.getColumn()); - break; - case FormulaRecord.sid: //数式 - FormulaRecord fr = (FormulaRecord)record; - addDataAndrChangeRow(fr.getRow(),fr.getColumn(), fr.getValue()); - //logger.debug( "数字 。　行："+fr.getRow()+", 列："+fr.getColumn()); - break; - } - } - /** - * HH:MM格式时间的数字转换方法 - * @param sNum - * @return - */ - private static String getTime(double daynum) - { - double totalSeconds=daynum*86400.0D; - //总的分钟数 - int seconds =(int)totalSeconds/60; - //实际小时数 - int hours =seconds/60; - int minutes = seconds-hours*60; - //剩余的实际分钟数 - StringBuffer sb=new StringBuffer(); - if(String.valueOf(hours).length()==1){ - sb.append( "0"+hours); - }else{ - sb.append(hours); - } - sb.append( ":" ); - if(String.valueOf(minutes).length()==1){ - sb.append( "0"+minutes); - }else{ - sb.append(minutes); - } - return sb.toString(); - } - /** - * 添加数据记录并检查是否换行 - * @param row 实际当前行号 - * @param col 实际记录当前列 - * @param value 当前cell的值 - */ - public void addDataAndrChangeRow(int row,int col,Object value){ - //当前行如果大于实际行表示改行忽略，不记录 - if(curRowNum!=row){ - if(CollectionUtils.isEmpty(currentSheetDataMap)){ - currentSheetDataMap=new ArrayList>(); - } - currentSheetDataMap.add(currentSheetRowDataMap); - //logger.debug( "行号:"+curRowNum +" 行内容："+currentSheetRowDataMap.toString()); - //logger.debug( "\n" ); - currentSheetRowDataMap=new HashMap(); - currentSheetRowDataMap.put(trianListheadTitle[col], value); - logger.debug(row+":"+col+" "+value+"\r" ); - curRowNum=row; - }else{ - currentSheetRowDataMap.put(trianListheadTitle[col], value); - //logger.debug(row+":"+col+" "+value+"\r" ); - } - } - public List> getCurrentSheetDataMap() { - return currentSheetDataMap; - } - public void setCurrentSheetDataMap(List> currentSheetDataMap) { - this.currentSheetDataMap = currentSheetDataMap; - } - public Map getCurrentSheetRowDataMap() { - return currentSheetRowDataMap; - } - public void setCurrentSheetRowDataMap(Map currentSheetRowDataMap) { - this.currentSheetRowDataMap = currentSheetRowDataMap; - } - public int getCurRowNum() { - return curRowNum; - } - public void setCurRowNum(int curRowNum) { - this.curRowNum = curRowNum; - } - public int getIgnoreRowNum() { - return ignoreRowNum; - } - public void setIgnoreRowNum(int ignoreRowNum) { - this.ignoreRowNum = ignoreRowNum; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/AbstractExcel2007Writer.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/AbstractExcel2007Writer.java deleted file mode 100644 index 15e1f87949..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/AbstractExcel2007Writer.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.x.okr.assemble.common.excel.writer; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Writer; -import java.util.Calendar; -import java.util.Enumeration; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipOutputStream; - -import org.apache.poi.hssf.util.CellReference; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; - -/** - * 抽象excel2007读入器，先构建.xlsx一张模板，改写模板中的sheet.xml,使用这种方法 - * 写入.xlsx文件，不需要太大的内存 - * - */ -public abstract class AbstractExcel2007Writer { - - private SpreadsheetWriter sw; - - /** - * 写入电子表格的主要流程 - * @param fileName - * @throws Exception - */ - @SuppressWarnings("resource") - public void process( String fileName ) throws Exception{ - // 建立工作簿和电子表格对象 - XSSFWorkbook wb = new XSSFWorkbook(); - XSSFSheet sheet = wb.createSheet( "sheet1" ); - // 持有电子表格数据的xml文件名 例如 /xl/worksheets/sheet1.xml - String sheetRef = sheet.getPackagePart().getPartName().getName(); - - // 保存模板 - FileOutputStream os = new FileOutputStream( "template.xlsx" ); - wb.write(os); - os.close(); - - // 生成xml文件 - File tmp = File.createTempFile( "sheet", ".xml" ); - Writer fw = new FileWriter(tmp); - sw = new SpreadsheetWriter(fw); - generate(); - fw.close(); - - // 使用产生的数据替换模板 - File templateFile = new File( "template.xlsx" ); - FileOutputStream out = new FileOutputStream(fileName); - substitute(templateFile, tmp, sheetRef.substring(1), out); - out.close(); - //删除文件之前调用一下垃圾回收器，否则无法删除模板文件 - System.gc(); - // 删除临时模板文件 - if (templateFile.isFile()&&templateFile.exists()){ - templateFile.delete(); - } - } - - /** - * 写入电子表格的主要流程 - * @param fileName - * @throws Exception - */ - @SuppressWarnings("resource") - public void process( OutputStream out ) throws Exception{ - // 建立工作簿和电子表格对象 - XSSFWorkbook wb = new XSSFWorkbook(); - XSSFSheet sheet = wb.createSheet( "sheet1" ); - // 持有电子表格数据的xml文件名 例如 /xl/worksheets/sheet1.xml - String sheetRef = sheet.getPackagePart().getPartName().getName(); - - // 保存模板 - FileOutputStream os = new FileOutputStream( "template.xlsx" ); - wb.write(os); - os.close(); - - // 生成xml文件 - File tmp = File.createTempFile( "sheet", ".xml" ); - Writer fw = new FileWriter(tmp); - sw = new SpreadsheetWriter(fw); - generate(); - fw.close(); - - // 使用产生的数据替换模板 - File templateFile = new File( "template.xlsx" ); - substitute(templateFile, tmp, sheetRef.substring(1), out); - out.close(); - //删除文件之前调用一下垃圾回收器，否则无法删除模板文件 - System.gc(); - // 删除临时模板文件 - if (templateFile.isFile()&&templateFile.exists()){ - templateFile.delete(); - } - } - - /** - * 类使用者应该使用此方法进行写操作 - * @throws Exception - */ - public abstract void generate() throws Exception; - - public void beginSheet() throws IOException { - sw.beginSheet(); - } - - public void insertRow(int rowNum) throws IOException { - sw.insertRow(rowNum); - } - - public void createCell(int columnIndex, String value) throws IOException { - sw.createCell(columnIndex, value, -1); - } - - public void createCell(int columnIndex, double value) throws IOException { - sw.createCell(columnIndex, value, -1); - } - - public void endRow() throws IOException { - sw.endRow(); - } - - public void endSheet() throws IOException { - sw.endSheet(); - } - - /** - * - * @param zipfile the template file - * @param tmpfile the XML file with the sheet data - * @param entry the name of the sheet entry to substitute, e.g. xl/worksheets/sheet1.xml - * @param out the stream to write the result to - */ - @SuppressWarnings("resource") - private static void substitute(File zipfile, File tmpfile, String entry, - OutputStream out) throws IOException { - ZipFile zip = new ZipFile(zipfile); - ZipOutputStream zos = new ZipOutputStream(out); - - @SuppressWarnings( "unchecked" ) - Enumeration en = (Enumeration) zip.entries(); - while (en.hasMoreElements()) { - ZipEntry ze = en.nextElement(); - if (!ze.getName().equals(entry)) { - zos.putNextEntry(new ZipEntry(ze.getName())); - InputStream is = zip.getInputStream(ze); - copyStream(is, zos); - is.close(); - } - } - zos.putNextEntry(new ZipEntry(entry)); - InputStream is = new FileInputStream(tmpfile); - copyStream(is, zos); - is.close(); - zos.close(); - } - - private static void copyStream(InputStream in, OutputStream out) - throws IOException { - byte[] chunk = new byte[1024]; - int count; - while ((count = in.read(chunk)) >= 0) { - out.write(chunk, 0, count); - } - } - - /** - * 在写入器中写入电子表格 - * - */ - public static class SpreadsheetWriter { - private final Writer _out; - private int _rownum; - private static String LINE_SEPARATOR = System.getProperty( "line.separator" ); - - public SpreadsheetWriter(Writer out) { - _out = out; - } - - public void beginSheet() throws IOException { - _out.write( "" - + "" ); - _out.write( ""+LINE_SEPARATOR); - } - - public void endSheet() throws IOException { - _out.write( "" ); - _out.write( "" ); - } - - /** - * 插入新行 - * - * @param rownum 以0开始 - */ - public void insertRow(int rownum) throws IOException { - _out.write( ""+LINE_SEPARATOR); - this._rownum = rownum; - } - - /** - * 插入行结束标志 - */ - public void endRow() throws IOException { - _out.write( ""+LINE_SEPARATOR); - } - - /** - * 插入新列 - * @param columnIndex - * @param value - * @param styleIndex - * @throws IOException - */ - public void createCell(int columnIndex, String value, int styleIndex) - throws IOException { - String ref = new CellReference(_rownum, columnIndex) - .formatAsString(); - _out.write( "" ); - _out.write( ""+XMLEncoder.encode(value)+"" ); - _out.write( "" ); - } - - public void createCell(int columnIndex, String value) - throws IOException { - createCell(columnIndex, value, -1); - } - - public void createCell(int columnIndex, double value, int styleIndex) - throws IOException { - String ref = new CellReference(_rownum, columnIndex) - .formatAsString(); - _out.write( "" ); - _out.write( "" + value + "" ); - _out.write( "" ); - } - - public void createCell(int columnIndex, double value) - throws IOException { - createCell(columnIndex, value, -1); - } - - public void createCell(int columnIndex, Calendar value, int styleIndex) - throws IOException { - createCell(columnIndex, DateUtil.getExcelDate(value, false), - styleIndex); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2003Writer.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2003Writer.java deleted file mode 100644 index 585771d26c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2003Writer.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.x.okr.assemble.common.excel.writer; - -import java.io.FileOutputStream; -import java.io.IOException; - -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; - -public class Excel2003Writer { - - /** - * @param args - */ - public static void main(String[] args) { - try{ - //System.out.println( "开始写入excel2003...." ); - writeExcel( "tes2003.xls" ); - //System.out.println( "写完xcel2003" ); - } catch (IOException e) { - - } - } - - - /** - * 写入excel并填充内容,一个sheet只能写65536行以下，超出会报异常，写入时建议使用AbstractExcel2007Writer - * @param fileName - * @throws IOException - */ - @SuppressWarnings("resource") - public static void writeExcel(String fileName) throws IOException{ - - // 创建excel2003对象 - Workbook wb = new HSSFWorkbook(); - - // 设置文件放置路径和文件名 - FileOutputStream fileOut = new FileOutputStream(fileName); - // 创建新的表单 - Sheet sheet = wb.createSheet( "newsheet" ); - // 创建新行 - for(int i=0;i<20000;i++){ - Row row = sheet.createRow(i); - // 创建单元格 - Cell cell = row.createCell(0); - // 设置单元格值 - cell.setCellValue(1); - row.createCell(1).setCellValue(1+i); - row.createCell(2).setCellValue(true); - row.createCell(3).setCellValue(0.43d); - row.createCell(4).setCellValue('d'); - row.createCell(5).setCellValue( "" ); - row.createCell(6).setCellValue( "第七列"+i); - row.createCell(7).setCellValue( "第八列"+i); - } - wb.write(fileOut); - fileOut.close(); - } - - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2007WriterImpl.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2007WriterImpl.java deleted file mode 100644 index 0b6a2bb18c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/Excel2007WriterImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.x.okr.assemble.common.excel.writer; -public class Excel2007WriterImpl extends AbstractExcel2007Writer{ - /* - * 可根据需求重写此方法，对于单元格的小数或者日期格式，会出现精度问题或者日期格式转化问题，建议使用字符串插入方法 - * @see com.excel.ver2.AbstractExcel2007Writer#generate() - */ - @Override - public void generate()throws Exception { - //电子表格开始 - beginSheet(); - for (int rownum = 0; rownum < 100; rownum++) { - //插入新行 - insertRow(rownum); - //建立新单元格,索引值从0开始,表示第一列 - createCell(0, "中国<" + rownum + "!" ); - createCell(1, 34343.123456789); - createCell(2, "23.67%" ); - createCell(3, "12:12:23" ); - createCell(4, "2010-10-11 12:12:23" ); - createCell(5, "true" ); - createCell(6, "false" ); - - //结束行 - endRow(); - } - //电子表格结束 - endSheet(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportContentExportExcelWriter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportContentExportExcelWriter.java deleted file mode 100644 index e146ee567a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportContentExportExcelWriter.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.x.okr.assemble.common.excel.writer; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.util.CellRangeAddress; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportContent; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportContentCenter; -import com.x.okr.assemble.control.schedule.entity.WorkReportProcessOpinionEntity; -import com.x.okr.assemble.control.service.OkrWorkDetailInfoService; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class WorkReportContentExportExcelWriter { - - private static Logger logger = LoggerFactory.getLogger(WorkReportContentExportExcelWriter.class); - private OkrWorkDetailInfoService okrWorkDetailInfoService = new OkrWorkDetailInfoService(); - private Integer currentRowNumber = 0; - - /** - * 写入excel并填充内容,一个sheet只能写65536行以下，超出会报异常，写入时建议大量数据时使用AbstractExcel2007Writer - * - * @param fileOut - * @throws IOException - */ - public String writeExcel(List exportDataList) { - String centerTitle = null; - Integer workCountInCenter = 0; - - Workbook wb = new HSSFWorkbook();// 创建excel2003对象 - Sheet sheet = wb.createSheet("工作汇报情况统计表");// 创建新的工作表 - Row row = null; - Cell cell = null; - // 表头////////////////////////////////////////////////////////////// - row = sheet.createRow(currentRowNumber); - row.createCell(0).setCellValue("工作类别"); - row.createCell(1).setCellValue("重点事项");// 中心工作内容 - row.createCell(2).setCellValue("责任组织"); - row.createCell(3).setCellValue("事项分解及描述");// 具体工作内容 - row.createCell(4).setCellValue("工作汇报情况"); - row.createCell(5).setCellValue("工作汇报形式"); - row.createCell(6).setCellValue("具体行动举措"); - row.createCell(7).setCellValue("预期里程碑/阶段性结果标志"); - row.createCell(8).setCellValue("截止目前完成情况"); - row.createCell(9).setCellValue("下一步工作要点及需求"); - row.createCell(10).setCellValue("督办评价"); - row.createCell(11).setCellValue("领导评价"); - - currentRowNumber++;// 表头占一行 - - if (exportDataList != null && !exportDataList.isEmpty()) { - for (WoOkrStatisticReportContentCenter contentForCenter : exportDataList) { - if (contentForCenter.getContents() != null && !contentForCenter.getContents().isEmpty()) { - // 中心工作中所有工作的数量 - workCountInCenter = contentForCenter.getContents().size(); - centerTitle = contentForCenter.getTitle(); - - logger.info(">>>>中心工作[" + centerTitle + "]:" + currentRowNumber + " --> " - + (currentRowNumber + workCountInCenter - 1)); - sheet.addMergedRegion( - new CellRangeAddress(currentRowNumber, (currentRowNumber + workCountInCenter - 1), 0, 0)); - sheet.addMergedRegion( - new CellRangeAddress(currentRowNumber, (currentRowNumber + workCountInCenter - 1), 1, 1)); - - for (WoOkrStatisticReportContent wrapOutOkrStatisticReportContent : contentForCenter - .getContents()) { - row = sheet.createRow(currentRowNumber); - row.createCell(0).setCellValue(wrapOutOkrStatisticReportContent.getWorkType());// "工作类别" - row.createCell(1).setCellValue(centerTitle);// "中心工作事项" - composeWorkToExcel(sheet, row, wrapOutOkrStatisticReportContent); - } - } - } - - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////// 单元格样式设计 ////////////////// - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - sheet.setDefaultColumnWidth(20); - sheet.setDefaultRowHeightInPoints(20); - - CellStyle cellStyle = wb.createCellStyle(); - cellStyle.setAlignment(HorizontalAlignment.CENTER); // 居中 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 居中 - - sheet.setColumnWidth(0, 10 * 256); - sheet.setColumnWidth(1, 50 * 256); - sheet.setColumnWidth(2, 20 * 256); - sheet.setColumnWidth(3, 50 * 256); - sheet.setColumnWidth(4, 10 * 256); - sheet.setColumnWidth(5, 10 * 256); - sheet.setColumnWidth(6, 50 * 256); - sheet.setColumnWidth(7, 50 * 256); - sheet.setColumnWidth(8, 50 * 256); - sheet.setColumnWidth(9, 50 * 256); - sheet.setColumnWidth(10, 50 * 256); - sheet.setColumnWidth(11, 50 * 256); - - Iterator rowIterator = sheet.rowIterator(); - Iterator cellIterator = null; - - while (rowIterator.hasNext()) { - row = rowIterator.next(); - row.setHeight((short) (40 * 20)); - - cellIterator = row.cellIterator(); - while (cellIterator.hasNext()) { - cell = cellIterator.next(); - cell.setCellStyle(cellStyle); - } - } - } - try { - String timeFlag = new DateOperation().getNowTimeChar(); - File dir = new File("download/temp"); - if (!dir.exists()) { - dir.mkdirs(); - } - FileOutputStream fos = new FileOutputStream("download/temp/export_" + timeFlag + ".xls"); - wb.write(fos); - fos.close(); - wb.close(); - return timeFlag; - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return "none"; - } - - private void composeWorkToExcel(Sheet sheet, Row row, - WoOkrStatisticReportContent wrapOutOkrStatisticReportContent) { - if (wrapOutOkrStatisticReportContent == null) { - return; - } - - List opinions = null; - OkrWorkDetailInfo detail = null; - String opinionContent = null; - Gson gson = XGsonBuilder.instance(); - String opinion = null; - - row.createCell(2).setCellValue(wrapOutOkrStatisticReportContent.getResponsibilityUnitName());// "责任组织" - row.createCell(5).setCellValue(wrapOutOkrStatisticReportContent.getCycleType());// "工作汇报形式" - row.createCell(8).setCellValue(wrapOutOkrStatisticReportContent.getProgressDescription());// "截止目前完成情况" - row.createCell(9).setCellValue(wrapOutOkrStatisticReportContent.getWorkPlan());// "下一步工作要点及需求" - row.createCell(10).setCellValue(wrapOutOkrStatisticReportContent.getAdminSuperviseInfo());// "督办评价" - - try { - detail = okrWorkDetailInfoService.get(wrapOutOkrStatisticReportContent.getWorkId()); - } catch (Exception e) { - logger.warn("system get work detail with work id got an exception."); - logger.error(e); - } - if (detail != null) { - row.createCell(6).setCellValue(detail.getProgressAction());// "具体行动举措" - row.createCell(7).setCellValue(detail.getLandmarkDescription());// "预期里程碑/阶段性结果标志" - row.createCell(3).setCellValue(detail.getWorkDetail());// "事项分解及描述" - } - - row.createCell(4).setCellValue(wrapOutOkrStatisticReportContent.getReportStatus());// "工作汇报情况" - - opinionContent = wrapOutOkrStatisticReportContent.getOpinion(); - if (opinionContent != null) { - opinion = ""; - opinions = gson.fromJson(opinionContent, new TypeToken>() { - }.getType()); - if (opinions != null) { - for (WorkReportProcessOpinionEntity workReportProcessOpinionEntity : opinions) { - opinion = opinion + workReportProcessOpinionEntity.getProcessorName() + ":" - + workReportProcessOpinionEntity.getOpinion() + "\n"; - } - row.createCell(11).setCellValue(opinion);// "领导评价" - } else { - row.createCell(11).setCellValue("");// "领导评价" - } - } - currentRowNumber++; - if (wrapOutOkrStatisticReportContent.getSubWork() != null - && !wrapOutOkrStatisticReportContent.getSubWork().isEmpty()) { - for (WoOkrStatisticReportContent subWorks : wrapOutOkrStatisticReportContent.getSubWork()) { - row = sheet.createRow(currentRowNumber); - composeWorkToExcel(sheet, row, subWorks); - } - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportStatusExportExcelWriter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportStatusExportExcelWriter.java deleted file mode 100644 index 77581eb444..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/WorkReportStatusExportExcelWriter.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.x.okr.assemble.common.excel.writer; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.util.CellRangeAddress; - -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportStatusEntity; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportStatusHeader; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportStatusTable; - -public class WorkReportStatusExportExcelWriter { - - private Integer currentRowNumber = 0; - - /** - * 写入excel并填充内容,一个sheet只能写65536行以下，超出会报异常，写入时建议大量数据时使用AbstractExcel2007Writer - * @param fileOut - * @throws IOException - */ - public String writeExcel( WoOkrStatisticReportStatusTable wrapOutOkrStatisticReportStatusTable ) { - String unitName = null; - String centerTitle = null; - Integer centerCount = 0; - Integer workCount = 0; - List headers = null; - List contents = null; - Workbook wb = new HSSFWorkbook();// 创建excel2003对象 - Sheet sheet = wb.createSheet( "工作汇报情况统计表" );// 创建新的工作表 - Row row = null; - Cell cell = null; - - if( wrapOutOkrStatisticReportStatusTable != null ){ - - headers = wrapOutOkrStatisticReportStatusTable.getHeader(); - contents = wrapOutOkrStatisticReportStatusTable.getContent(); - - //表头////////////////////////////////////////////////////////////// - row = sheet.createRow( currentRowNumber ); - if( headers != null && !headers.isEmpty() ){ - for( int i = 0; i " + ( currentRowNumber + centerCount -1 )+ ": 组织["+ unitName +"]" ); - sheet.addMergedRegion( new CellRangeAddress( currentRowNumber, ( currentRowNumber + centerCount -1 ), 0, 0 )); - - for( WoOkrStatisticReportStatusEntity centerEntity : unitEntity.getArray() ){ - centerTitle = centerEntity.getTitle(); - workCount = centerEntity.getRowCount(); - - //logger.info( "--|------" + currentRowNumber + " --> " + ( currentRowNumber + workCount -1 ) + ": 中心工作["+ centerTitle +"]"); - sheet.addMergedRegion( new CellRangeAddress( currentRowNumber, ( currentRowNumber + workCount -1 ), 1, 1 )); - - for( WoOkrStatisticReportStatusEntity workEntity : centerEntity.getArray() ){ - row = sheet.createRow( currentRowNumber ); - row.createCell(0).setCellValue( unitName ); - row.createCell(1).setCellValue( centerTitle ); - - //logger.info( "----|--"+ currentRowNumber +": 具体工作["+ workEntity.getTitle() +"]" ); - row.createCell(2).setCellValue( workEntity.getTitle() ); - if( workEntity.getFields() != null && !workEntity.getFields().isEmpty() ){ - for( int i = 0; i rowIterator = sheet.rowIterator(); - Iterator cellIterator = null; - - while( rowIterator.hasNext() ){ - row = rowIterator.next(); - row.setHeight( (short) ( 40 * 20 ) ); - - cellIterator = row.cellIterator(); - while( cellIterator.hasNext() ){ - cell = cellIterator.next(); - cell.setCellStyle( cellStyle ); - } - } - } - try { - String timeFlag = new DateOperation().getNowTimeChar(); - File dir = new File("download/temp"); - if( !dir.exists() ){ - dir.mkdirs(); - } - FileOutputStream fos = new FileOutputStream("download/temp/export_"+timeFlag+".xls"); - wb.write( fos ); - fos.close(); - wb.close(); - return timeFlag; - } catch (IOException e) { - e.printStackTrace(); - } - } - return "none"; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/XMLEncoder.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/XMLEncoder.java deleted file mode 100644 index 948610a193..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/common/excel/writer/XMLEncoder.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.x.okr.assemble.common.excel.writer; - -public class XMLEncoder { - - private static final String[] xmlCode = new String[256]; - - static { - // Special characters - xmlCode['\''] = "'"; - xmlCode['\"'] = "\""; // double quote - xmlCode['&'] = "&"; // ampersand - xmlCode['<'] = "<"; // lower than - xmlCode['>'] = ">"; // greater than - } - - /** - *

- * Encode the given text into xml. - *

- * - * @param string the text to encode - * @return the encoded string - */ - public static String encode(String string) { - if (string == null) return ""; - int n = string.length(); - char character; - String xmlchar; - StringBuffer buffer = new StringBuffer(); - // loop over all the characters of the String. - for (int i = 0; i < n; i++) { - character = string.charAt(i); - // the xmlcode of these characters are added to a StringBuffer one by one - try { - xmlchar = xmlCode[character]; - if (xmlchar == null) { - buffer.append(character); - } else { - buffer.append(xmlCode[character]); - } - } catch (ArrayIndexOutOfBoundsException aioobe) { - buffer.append(character); - } - } - return buffer.toString(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/AbstractFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/AbstractFactory.java deleted file mode 100644 index 5b0b794978..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/AbstractFactory.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.x.okr.assemble.control; - -import com.x.base.core.container.EntityManagerContainer; - -public abstract class AbstractFactory { - - private Business business; - - public AbstractFactory( Business business ) throws Exception { - try { - if ( null == business ) { - throw new Exception( "business can not be null. " ); - } - this.business = business; - } catch ( Exception e ) { - throw new Exception( "can not instantiating factory." ); - } - } - - public EntityManagerContainer entityManagerContainer() throws Exception { - return this.business.entityManagerContainer(); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ApplicationServletContextListener.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ApplicationServletContextListener.java deleted file mode 100644 index 6dfaf08f71..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ApplicationServletContextListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.x.okr.assemble.control; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; - -import com.x.base.core.project.Context; - -@WebListener -public class ApplicationServletContextListener implements ServletContextListener { - - @Override - public void contextInitialized(ServletContextEvent servletContextEvent) { - try { - ThisApplication.context = Context.concrete(servletContextEvent); - ThisApplication.init(); - ThisApplication.context().regist(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - public void contextDestroyed(ServletContextEvent servletContextEvent) { - try { - ThisApplication.destroy(); - ThisApplication.context.destrory(servletContextEvent); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/Business.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/Business.java deleted file mode 100644 index 6a00e269c7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/Business.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.x.okr.assemble.control; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.okr.assemble.control.factory.OkrAttachmentFileInfoFactory; -import com.x.okr.assemble.control.factory.OkrCenterWorkInfoFactory; -import com.x.okr.assemble.control.factory.OkrConfigSecretaryFactory; -import com.x.okr.assemble.control.factory.OkrConfigSystemFactory; -import com.x.okr.assemble.control.factory.OkrConfigWorkLevelFactory; -import com.x.okr.assemble.control.factory.OkrConfigWorkTypeFactory; -import com.x.okr.assemble.control.factory.OkrErrorSystemIdentityInfoFactory; -import com.x.okr.assemble.control.factory.OkrStatisticReportContentFactory; -import com.x.okr.assemble.control.factory.OkrStatisticReportStatusFactory; -import com.x.okr.assemble.control.factory.OkrTaskFactory; -import com.x.okr.assemble.control.factory.OkrTaskHandledFactory; -import com.x.okr.assemble.control.factory.OkrUserInfoFactory; -import com.x.okr.assemble.control.factory.OkrWorkAppraiseInfoFactory; -import com.x.okr.assemble.control.factory.OkrWorkAuthorizeRecordFactory; -import com.x.okr.assemble.control.factory.OkrWorkBaseInfoFactory; -import com.x.okr.assemble.control.factory.OkrWorkChatFactory; -import com.x.okr.assemble.control.factory.OkrWorkDetailInfoFactory; -import com.x.okr.assemble.control.factory.OkrWorkDynamicsFactory; -import com.x.okr.assemble.control.factory.OkrWorkPersonFactory; -import com.x.okr.assemble.control.factory.OkrWorkPersonSearchFactory; -import com.x.okr.assemble.control.factory.OkrWorkReportBaseInfoFactory; -import com.x.okr.assemble.control.factory.OkrWorkReportDetailInfoFactory; -import com.x.okr.assemble.control.factory.OkrWorkReportPersonLinkFactory; -import com.x.okr.assemble.control.factory.OkrWorkReportProcessLogFactory; -import com.x.organization.core.express.Organization; - -public class Business { - - private EntityManagerContainer emc; - - public Business(EntityManagerContainer emc) throws Exception { - this.emc = emc; - } - public EntityManagerContainer entityManagerContainer() { - return this.emc; - } - //人员组织业务处理类 - private Organization organization; - - private OkrStatisticReportContentFactory okrStatisticReportContentFactory; - private OkrStatisticReportStatusFactory okrStatisticReportStatusFactory; - - private OkrAttachmentFileInfoFactory okrAttachmentFileInfoFactory; - private OkrCenterWorkInfoFactory okrCenterWorkInfoFactory; - private OkrConfigSecretaryFactory okrConfigSecretaryFactory; - private OkrConfigSystemFactory okrConfigSystemFactory; - private OkrConfigWorkLevelFactory okrConfigWorkLevelFactory; - private OkrConfigWorkTypeFactory okrConfigWorkTypeFactory; - private OkrTaskFactory okrTaskFactory; - private OkrTaskHandledFactory okrTaskHandledFactory; - private OkrWorkAuthorizeRecordFactory okrWorkAuthorizeRecordFactory; - private OkrWorkBaseInfoFactory okrWorkBaseInfoFactory; - private OkrWorkAppraiseInfoFactory okrWorkAppraiseInfoFactory; - private OkrWorkDetailInfoFactory okrWorkDetailInfoFactory; - private OkrWorkDynamicsFactory okrWorkDynamicsFactory; - private OkrWorkPersonFactory okrWorkPersonFactory; - private OkrWorkPersonSearchFactory okrWorkPersonSearchFactory; - private OkrWorkReportBaseInfoFactory okrWorkReportBaseInfoFactory; - private OkrWorkReportDetailInfoFactory okrWorkReportDetailInfoFactory; - private OkrWorkReportPersonLinkFactory okrWorkReportPersonLinkFactory; - private OkrWorkReportProcessLogFactory okrWorkReportProcessLogFactory; - private OkrErrorSystemIdentityInfoFactory okrErrorSystemIdentityInfoFactory; - private OkrUserInfoFactory okrUserInfoFactory; - - - - private OkrWorkChatFactory okrWorkChatFactory; - - public Organization organization() throws Exception { - if (null == this.organization) { - this.organization = new Organization(ThisApplication.context()); - } - return organization; - } - - public OkrWorkAppraiseInfoFactory okrWorkAppraiseInfoFactory() throws Exception { - if (null == this.okrWorkAppraiseInfoFactory) { - this.okrWorkAppraiseInfoFactory = new OkrWorkAppraiseInfoFactory( this ); - } - return okrWorkAppraiseInfoFactory; - } - - public OkrErrorSystemIdentityInfoFactory okrErrorSystemIdentityInfoFactory() throws Exception { - if (null == this.okrErrorSystemIdentityInfoFactory) { - this.okrErrorSystemIdentityInfoFactory = new OkrErrorSystemIdentityInfoFactory( this ); - } - return okrErrorSystemIdentityInfoFactory; - } - public OkrStatisticReportStatusFactory okrStatisticReportStatusFactory() throws Exception { - if (null == this.okrStatisticReportStatusFactory) { - this.okrStatisticReportStatusFactory = new OkrStatisticReportStatusFactory( this ); - } - return okrStatisticReportStatusFactory; - } - public OkrUserInfoFactory okrUserInfoFactory() throws Exception { - if (null == this.okrUserInfoFactory) { - this.okrUserInfoFactory = new OkrUserInfoFactory( this ); - } - return okrUserInfoFactory; - } - public OkrStatisticReportContentFactory okrStatisticReportContentFactory() throws Exception { - if (null == this.okrStatisticReportContentFactory) { - this.okrStatisticReportContentFactory = new OkrStatisticReportContentFactory( this ); - } - return okrStatisticReportContentFactory; - } - public OkrWorkChatFactory okrWorkChatFactory() throws Exception { - if (null == this.okrWorkChatFactory) { - this.okrWorkChatFactory = new OkrWorkChatFactory( this ); - } - return okrWorkChatFactory; - } - public OkrAttachmentFileInfoFactory okrAttachmentFileInfoFactory() throws Exception { - if (null == this.okrAttachmentFileInfoFactory) { - this.okrAttachmentFileInfoFactory = new OkrAttachmentFileInfoFactory( this ); - } - return okrAttachmentFileInfoFactory; - } - public OkrCenterWorkInfoFactory okrCenterWorkInfoFactory() throws Exception { - if (null == this.okrCenterWorkInfoFactory) { - this.okrCenterWorkInfoFactory = new OkrCenterWorkInfoFactory( this ); - } - return okrCenterWorkInfoFactory; - } - public OkrConfigWorkLevelFactory okrConfigWorkLevelFactory() throws Exception { - if (null == this.okrConfigWorkLevelFactory) { - this.okrConfigWorkLevelFactory = new OkrConfigWorkLevelFactory( this ); - } - return okrConfigWorkLevelFactory; - } - public OkrConfigSecretaryFactory okrConfigSecretaryFactory() throws Exception { - if (null == this.okrConfigSecretaryFactory) { - this.okrConfigSecretaryFactory = new OkrConfigSecretaryFactory( this ); - } - return okrConfigSecretaryFactory; - } - public OkrConfigSystemFactory okrConfigSystemFactory() throws Exception { - if (null == this.okrConfigSystemFactory) { - this.okrConfigSystemFactory = new OkrConfigSystemFactory( this ); - } - return okrConfigSystemFactory; - } - public OkrConfigWorkTypeFactory okrConfigWorkTypeFactory() throws Exception { - if (null == this.okrConfigWorkTypeFactory) { - this.okrConfigWorkTypeFactory = new OkrConfigWorkTypeFactory( this ); - } - return okrConfigWorkTypeFactory; - } - public OkrTaskFactory okrTaskFactory() throws Exception { - if (null == this.okrTaskFactory) { - this.okrTaskFactory = new OkrTaskFactory( this ); - } - return okrTaskFactory; - } - public OkrTaskHandledFactory okrTaskHandledFactory() throws Exception { - if (null == this.okrTaskHandledFactory) { - this.okrTaskHandledFactory = new OkrTaskHandledFactory( this ); - } - return okrTaskHandledFactory; - } - public OkrWorkAuthorizeRecordFactory okrWorkAuthorizeRecordFactory() throws Exception { - if (null == this.okrWorkAuthorizeRecordFactory) { - this.okrWorkAuthorizeRecordFactory = new OkrWorkAuthorizeRecordFactory( this ); - } - return okrWorkAuthorizeRecordFactory; - } - public OkrWorkBaseInfoFactory okrWorkBaseInfoFactory() throws Exception { - if (null == this.okrWorkBaseInfoFactory) { - this.okrWorkBaseInfoFactory = new OkrWorkBaseInfoFactory( this ); - } - return okrWorkBaseInfoFactory; - } - public OkrWorkDetailInfoFactory okrWorkDetailInfoFactory() throws Exception { - if (null == this.okrWorkDetailInfoFactory) { - this.okrWorkDetailInfoFactory = new OkrWorkDetailInfoFactory( this ); - } - return okrWorkDetailInfoFactory; - } - public OkrWorkDynamicsFactory okrWorkDynamicsFactory() throws Exception { - if (null == this.okrWorkDynamicsFactory) { - this.okrWorkDynamicsFactory = new OkrWorkDynamicsFactory( this ); - } - return okrWorkDynamicsFactory; - } - public OkrWorkPersonFactory okrWorkPersonFactory() throws Exception { - if (null == this.okrWorkPersonFactory) { - this.okrWorkPersonFactory = new OkrWorkPersonFactory( this ); - } - return okrWorkPersonFactory; - } - public OkrWorkPersonSearchFactory okrWorkPersonSearchFactory() throws Exception { - if (null == this.okrWorkPersonSearchFactory) { - this.okrWorkPersonSearchFactory = new OkrWorkPersonSearchFactory( this ); - } - return okrWorkPersonSearchFactory; - } - public OkrWorkReportBaseInfoFactory okrWorkReportBaseInfoFactory() throws Exception { - if (null == this.okrWorkReportBaseInfoFactory) { - this.okrWorkReportBaseInfoFactory = new OkrWorkReportBaseInfoFactory( this ); - } - return okrWorkReportBaseInfoFactory; - } - public OkrWorkReportDetailInfoFactory okrWorkReportDetailInfoFactory() throws Exception { - if (null == this.okrWorkReportDetailInfoFactory) { - this.okrWorkReportDetailInfoFactory = new OkrWorkReportDetailInfoFactory( this ); - } - return okrWorkReportDetailInfoFactory; - } - public OkrWorkReportPersonLinkFactory okrWorkReportPersonLinkFactory() throws Exception { - if (null == this.okrWorkReportPersonLinkFactory) { - this.okrWorkReportPersonLinkFactory = new OkrWorkReportPersonLinkFactory( this ); - } - return okrWorkReportPersonLinkFactory; - } - public OkrWorkReportProcessLogFactory okrWorkReportProcessLogFactory() throws Exception { - if (null == this.okrWorkReportProcessLogFactory) { - this.okrWorkReportProcessLogFactory = new OkrWorkReportProcessLogFactory( this ); - } - return okrWorkReportProcessLogFactory; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/OkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/OkrUserCache.java deleted file mode 100644 index 0fa2049b6e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/OkrUserCache.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.x.okr.assemble.control; - -import java.io.Serializable; - -import com.x.base.core.project.gson.GsonPropertyObject; - -public class OkrUserCache extends GsonPropertyObject implements Serializable { - - private static final long serialVersionUID = 1L; - /** - * 操作用户的姓名 - */ - private String operationUserName = null; - /** - * 操作用户的组织名称 - */ - private String operationUserUnitName = null; - /** - * 操作用户的顶层组织名称 - */ - private String operationUserTopUnitName = null; - /** - * 代理用户的身份名称 - */ - private String loginIdentityName = null; - /** - * 代理用户的姓名 - */ - private String loginUserName = null; - /** - * 代理用户的组织名称 - */ - private String loginUserUnitName = null; - /** - * 代理用户的顶层组织名称 - */ - private String loginUserTopUnitName = null; - - private boolean okrManager = false; //系统管理员 - - - public boolean isOkrManager() { - return okrManager; - } - public void setOkrManager(boolean okrManager) { - this.okrManager = okrManager; - } - - public String getOperationUserName() { - return operationUserName; - } - public void setOperationUserName(String operationUserName) { - this.operationUserName = operationUserName; - } - public String getOperationUserUnitName() { - return operationUserUnitName; - } - public void setOperationUserUnitName(String operationUserUnitName) { - this.operationUserUnitName = operationUserUnitName; - } - public String getOperationUserTopUnitName() { - return operationUserTopUnitName; - } - public void setOperationUserTopUnitName(String operationUserTopUnitName) { - this.operationUserTopUnitName = operationUserTopUnitName; - } - public String getLoginIdentityName() { - return loginIdentityName; - } - public void setLoginIdentityName(String loginIdentityName) { - this.loginIdentityName = loginIdentityName; - } - public String getLoginUserName() { - return loginUserName; - } - public void setLoginUserName(String loginUserName) { - this.loginUserName = loginUserName; - } - public String getLoginUserUnitName() { - return loginUserUnitName; - } - public void setLoginUserUnitName(String loginUserUnitName) { - this.loginUserUnitName = loginUserUnitName; - } - public String getLoginUserTopUnitName() { - return loginUserTopUnitName; - } - public void setLoginUserTopUnitName(String loginUserTopUnitName) { - this.loginUserTopUnitName = loginUserTopUnitName; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ThisApplication.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ThisApplication.java deleted file mode 100644 index e235ce5c60..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ThisApplication.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.x.okr.assemble.control; - -import java.util.HashMap; -import java.util.Map; - -import com.x.base.core.project.Context; -import com.x.base.core.project.cache.CacheManager; -import com.x.base.core.project.config.Config; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.queue.QueueWorkDynamicRecord; -import com.x.okr.assemble.control.jaxrs.workimport.CacheImportFileStatus; -import com.x.okr.assemble.control.schedule.ErrorIdentityCheckTask; -import com.x.okr.assemble.control.schedule.St_CenterWorkCount; -import com.x.okr.assemble.control.schedule.St_WorkReportContent; -import com.x.okr.assemble.control.schedule.St_WorkReportStatus; -import com.x.okr.assemble.control.schedule.WorkProgressConfirm; -import com.x.okr.assemble.control.schedule.WorkReportCollectCreate; -import com.x.okr.assemble.control.schedule.WorkReportCreate; -import com.x.okr.assemble.control.service.OkrConfigSystemService; - -public class ThisApplication { - - private ThisApplication() { - // nothing - } - - protected static Context context; - - public static Map importFileStatusMap = new HashMap(); - - public static final String OKRMANAGER = "OKRManager"; - - public static final QueueWorkDynamicRecord queueWorkDynamicRecord = new QueueWorkDynamicRecord(); - - public static Context context() { - return context; - } - - public static void init() { - try { - CacheManager.init(context.clazz().getSimpleName()); - LoggerFactory.setLevel(Config.logLevel().x_okr_assemble_control()); - context().startQueue(queueWorkDynamicRecord); - new OkrConfigSystemService().initAllSystemConfig(); - // 每天凌晨2点执行一次 - context.schedule(St_WorkReportContent.class, "0 0 2 * * ?"); - // 每天凌晨2点30执行一次 - context.schedule(St_WorkReportStatus.class, "0 30 2 * * ?"); - // 每天5点至20点间，每10分钟执行一次 - context.schedule(St_CenterWorkCount.class, "0 0/10 5-20 * * ?"); - // 每天7点至17点间，每10分钟执行一次 - context.schedule(WorkReportCreate.class, "0 0/10 7-17 * * ?"); - // 每天7点至17点间，每小时执行一次 - context.schedule(WorkProgressConfirm.class, "0 0 7-17/1 * * ?"); - // 每天7点至17点间，每10分钟执行一次 - context.schedule(WorkReportCollectCreate.class, "0 0/10 7-17 * * ?"); - // 每天凌晨2点执行一次 - context.schedule(ErrorIdentityCheckTask.class, "0 0 2 * * ?"); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void destroy() { - try { - CacheManager.shutdown(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static String getOkrUserInfoCacheKey(String personName) { - return "OkrUserInfo.withPerson." + personName; - } - - public static Map getImportFileStatusMap() { - return importFileStatusMap; - } - - public static void setImportFileStatusMap(Map importFileStatusMap) { - ThisApplication.importFileStatusMap = importFileStatusMap; - } - - /** - * 根据用户姓名，获取一个用户登录信息缓存 - * - * @param name - * @return - */ - public static CacheImportFileStatus getCacheImportFileStatusElementByKey(String key) { - if (importFileStatusMap == null) { - importFileStatusMap = new HashMap(); - } - return importFileStatusMap.get(key); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/WebservicesClient.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/WebservicesClient.java deleted file mode 100644 index 350927fcb9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/WebservicesClient.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.webservice; - -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; - -import com.google.gson.JsonElement; -import com.x.okr.assemble.control.ThisApplication; - -public class WebservicesClient { - public Object[] jaxws(String wsdl, String method, Object... objects) { - Object[] result = null; - try { - JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); - Client client = dcf.createClient(wsdl); - result = client.invoke(method, objects); - } catch (Exception e) { - e.printStackTrace(); - } - return result; - } - - public JsonElement jaxrsGet(String applicationName, String uri) throws Exception { - Class clz = Class.forName("com.x.base.core.project." + applicationName); - return ThisApplication.context().applications().getQuery(clz, uri).getData(); - } - - public JsonElement jaxrsPut(String applicationName, String uri, Object o) throws Exception { - Class clz = Class.forName("com.x.base.core.project." + applicationName); - return ThisApplication.context().applications().putQuery(clz, uri, o).getData(); - } - - public JsonElement jaxrsPost(String applicationName, String uri, Object o) throws Exception { - Class clz = Class.forName("com.x.base.core.project." + applicationName); - return ThisApplication.context().applications().postQuery(clz, uri, o).getData(); - } - - public JsonElement jaxrsDelete(String applicationName, String uri, Object o) throws Exception { - Class clz = Class.forName("com.x.base.core.project." + applicationName); - return ThisApplication.context().applications().deleteQuery(clz, uri).getData(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessage.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessage.java deleted file mode 100644 index a056e1c5b0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessage.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.webservice.sms; - -public class SmsMessage { - String UNID = null; - String CONTENT = null; - - public SmsMessage(String uNID, String cONTENT) { - super(); - UNID = uNID; - CONTENT = cONTENT; - } - public String getUNID() { - return UNID; - } - public String getCONTENT() { - return CONTENT; - } - public void setUNID(String uNID) { - UNID = uNID; - } - public void setCONTENT(String cONTENT) { - CONTENT = cONTENT; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessageOperator.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessageOperator.java deleted file mode 100644 index 85cdec0c8e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/webservice/sms/SmsMessageOperator.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.webservice.sms; - -import org.apache.commons.lang3.StringUtils; - -import com.x.okr.assemble.control.dataadapter.webservice.WebservicesClient; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrUserManagerService; - -public class SmsMessageOperator { - - public static OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - - public static OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - - public static Boolean sendWithPersonName( String personName, String message ) { - String unique = null; - try { - unique = okrUserManagerService.getUniqueWithPerson(personName); - sendWithUnique(unique, message); - } catch (Exception e1) { - System.out.println("system query employee unique with person name got an exception!"); - e1.printStackTrace(); - return false; - } - return false; - } - - public static Boolean sendWithUnique( String unique, String message ) { - if( StringUtils.isNotEmpty( unique )) { - String SMS_WSDL = null; - WebservicesClient webservicesClient = new WebservicesClient(); - try { - SMS_WSDL = okrConfigSystemService.getValueWithConfigCode("SMS_WSDL"); - } catch (Exception e) { - System.out.println("okr system get parameter named 'SMS_WSDL' got an exception!"); - e.printStackTrace(); - } - - message = "O2OA_OKR message: " + message; - - if(StringUtils.isNotEmpty(SMS_WSDL) && !"NONE".equalsIgnoreCase( SMS_WSDL )) { - try { - Object result = webservicesClient.jaxws( SMS_WSDL, "SENDSMS", unique, message); - System.out.println("Message send successful! result:" + result.toString()); - return true; - } catch (Exception e) { - e.printStackTrace(); - } - }else { - System.out.println("Message can not send, because sms wsdl not defind!"); - } - }else { - System.out.println("Message can not send, because employee unique is empty!"); - } - return false; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfReadCountGetter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfReadCountGetter.java deleted file mode 100644 index 8682bd1b02..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfReadCountGetter.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.wftask; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import com.x.base.core.project.x_processplatform_assemble_surface; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.connection.ActionResponse; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.service.OkrConfigSystemService; - -/** - * 获取指定用户所有的待阅数量信息 - * - * @author O2LEE - */ -public class WfReadCountGetter { - - public static OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - - public Long countWithProcess(String person) throws Exception { - String APPRAISE_WORKFLOW_ID = null; - - try { - APPRAISE_WORKFLOW_ID = okrConfigSystemService.getValueWithConfigCode("APPRAISE_WORKFLOW_ID"); - } catch (Exception e) { - System.out.println("获取流程ID参数发生异常"); - e.printStackTrace(); - } - - if( StringUtils.isNotEmpty(APPRAISE_WORKFLOW_ID)) { - JsonParser jsonParser = new JsonParser(); - String json = "{"; - json += "\"credentialList\":["; - json += "'"+person+"'"; - json += "],"; - json += "\"appliationList\":[],"; - json += "\"processList\":["; - json += "'"+APPRAISE_WORKFLOW_ID+"'"; - json += "]"; - json += "}"; - - String serviceUri = "read/count/filter"; - JsonElement data = jsonParser.parse( json ); // 将json字符串转换成JsonElement - ActionResponse resp = ThisApplication.context().applications().postQuery( - x_processplatform_assemble_surface.class, serviceUri, data - ); - - Wo wo = resp.getData( Wo.class ); -// if( wo != null ){ -// System.out.println(">>>>>>>>>>>>>>获取到用户的待阅（READ）数量：" + wo.count + ", 指定流程ID：" + APPRAISE_WORKFLOW_ID ); -// } - return wo.count; - } - return 0L; - } - - public static class Wo extends GsonPropertyObject { - - @FieldDescribe("待办数量") - private Long count = 0L; - - public Long getCount() { - return count; - } - - public void setCount(Long count) { - this.count = count; - } - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfTaskCountGetter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfTaskCountGetter.java deleted file mode 100644 index db4b3bb8e8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/wftask/WfTaskCountGetter.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.wftask; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import com.x.base.core.project.x_processplatform_assemble_surface; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.connection.ActionResponse; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.service.OkrConfigSystemService; - -/** - * 获取指定用户所有的待办数量信息 - * - * @author O2LEE - */ -public class WfTaskCountGetter { - - public static OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - - public Long countWithProcess(String person) throws Exception { - String APPRAISE_WORKFLOW_ID = null; - - try { - APPRAISE_WORKFLOW_ID = okrConfigSystemService.getValueWithConfigCode("APPRAISE_WORKFLOW_ID"); - } catch (Exception e) { - System.out.println("获取流程ID参数发生异常"); - e.printStackTrace(); - } - - if( StringUtils.isNotEmpty(APPRAISE_WORKFLOW_ID)) { - JsonParser jsonParser = new JsonParser(); - String json = "{"; - json += "\"credentialList\":["; - json += "'"+person+"'"; - json += "],"; - json += "\"appliationList\":[],"; - json += "\"processList\":["; - json += "'"+APPRAISE_WORKFLOW_ID+"'"; - json += "]"; - json += "}"; - - String serviceUri = "task/count/filter"; - JsonElement data = jsonParser.parse( json ); // 将json字符串转换成JsonElement - ActionResponse resp = ThisApplication.context().applications().postQuery( - x_processplatform_assemble_surface.class, serviceUri, data - ); - - Wo wo = resp.getData( Wo.class ); -// if( wo != null ){ -// System.out.println(">>>>>>>>>>>>>>获取到用户的待办（TASK）数量：" + wo.count + ", 指定流程ID：" + APPRAISE_WORKFLOW_ID ); -// } - return wo.count; - } - return 0L; - } - - public static class Wo extends GsonPropertyObject { - - @FieldDescribe("待办数量") - private Long count = 0L; - - public Long getCount() { - return count; - } - - public void setCount(Long count) { - this.count = count; - } - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkComplexGetter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkComplexGetter.java deleted file mode 100644 index 23c7a277f8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkComplexGetter.java +++ /dev/null @@ -1,251 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.workflow; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.x_processplatform_assemble_surface; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.connection.ActionResponse; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.okr.assemble.control.ThisApplication; -import com.x.processplatform.core.entity.content.Read; -import com.x.processplatform.core.entity.content.Task; -import com.x.processplatform.core.entity.content.TaskCompleted; -import com.x.processplatform.core.entity.content.Work; -import com.x.processplatform.core.entity.content.WorkLog; -import com.x.processplatform.core.entity.element.ActivityType; - - -/** - * 获取工作流状态以及下一步处理人的服务 - * - * @author O2LEE - */ -public class WorkComplexGetter { - - public Wo getWorkComplex( String workId ) throws Exception { - String serviceUri = "work/" + workId; - ActionResponse resp = ThisApplication.context().applications().getQuery( - x_processplatform_assemble_surface.class, serviceUri - ); - Wo wo = resp.getData( Wo.class ); - return wo; - } - - public static class Wo extends GsonPropertyObject { - - @FieldDescribe("活动节点") - private WoActivity activity; - - @FieldDescribe("工作") - private WoWork work; - - @FieldDescribe("待办对象列表") - private List taskList = new ArrayList<>(); - - @FieldDescribe("工作日志对象") - private List workLogList = new ArrayList<>(); - - public WoActivity getActivity() { - return activity; - } - - public WoWork getWork() { - return work; - } - - public List getWorkLogList() { - return workLogList; - } - - public void setActivity(WoActivity activity) { - this.activity = activity; - } - - public void setWork(WoWork work) { - this.work = work; - } - - public void setWorkLogList(List workLogList) { - this.workLogList = workLogList; - } - - public List getTaskList() { - return taskList; - } - - public void setTaskList(List taskList) { - this.taskList = taskList; - } - } - - public static class WoActivity extends GsonPropertyObject { - - private String id; - - private String name; - - private String description; - - private String alias; - - private String position; - - private ActivityType activityType; - - private String resetRange; - - private Integer resetCount; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public ActivityType getActivityType() { - return activityType; - } - - public void setActivityType(ActivityType activityType) { - this.activityType = activityType; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getResetCount() { - return resetCount; - } - - public void setResetCount(Integer resetCount) { - this.resetCount = resetCount; - } - - public String getResetRange() { - return resetRange; - } - - public void setResetRange(String resetRange) { - this.resetRange = resetRange; - } - - } - - public static class WoWork extends Work { - - private static final long serialVersionUID = 3269592171662996253L; - - static WrapCopier copier = WrapCopierFactory.wo(Work.class, WoWork.class, null, - JpaObject.FieldsInvisible); - } - - public static class WoWorkLog extends WorkLog { - - private static final long serialVersionUID = 1307569946729101786L; - - public static WrapCopier copier = WrapCopierFactory.wo(WorkLog.class, WoWorkLog.class, null, - JpaObject.FieldsInvisible); - - private List taskCompletedList; - - private List taskList; - - private Integer currentTaskIndex; - - public Integer getCurrentTaskIndex() { - return currentTaskIndex; - } - - public void setCurrentTaskIndex(Integer currentTaskIndex) { - this.currentTaskIndex = currentTaskIndex; - } - - public List getTaskCompletedList() { - return taskCompletedList; - } - - public void setTaskCompletedList(List taskCompletedList) { - this.taskCompletedList = taskCompletedList; - } - - public List getTaskList() { - return taskList; - } - - public void setTaskList(List taskList) { - this.taskList = taskList; - } - - } - - public static class WoTask extends Task { - - private static final long serialVersionUID = 2279846765261247910L; - - public static WrapCopier copier = WrapCopierFactory.wo(Task.class, WoTask.class, null, - JpaObject.FieldsInvisible); - - } - - public static class WoRead extends Read { - - private static final long serialVersionUID = -8067704098385000667L; - - public static WrapCopier copier = WrapCopierFactory.wo(Read.class, WoRead.class, null, - JpaObject.FieldsInvisible); - - } - - public static class WoTaskCompleted extends TaskCompleted { - - private static final long serialVersionUID = -7253999118308715077L; - - public static WrapCopier copier = WrapCopierFactory.wo(TaskCompleted.class, - WoTaskCompleted.class, null, JpaObject.FieldsInvisible); - private Long rank; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowReaderAdder.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowReaderAdder.java deleted file mode 100644 index e5452d56c6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowReaderAdder.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.workflow; - -import java.io.UnsupportedEncodingException; -import java.util.List; - -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import com.x.base.core.project.x_processplatform_assemble_surface; -import com.x.base.core.project.connection.ActionResponse; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.ThisApplication; - -/** - * 为工作流添加阅读权限 - * - * @author O2LEE - */ -public class WorkFlowReaderAdder { - - /** - * 为工作流添加阅读权限 - * @param data - * @return - * @throws UnsupportedEncodingException - * @throws Exception - */ - public void add( String wf_workId, List identities ) throws UnsupportedEncodingException, Exception { - if( ListTools.isEmpty(identities )) { - return; - } - JsonParser jsonParser = new JsonParser(); - String json = "{"; - json += "\"notify\": false,"; - json += "\"identityList\":["; - for(int i=0; i< identities.size() ; i++ ) { - if(i == 0 ) { - json += "'"+ identities.get(i) +"'"; - }else { - json += ", '"+ identities.get(i) +"'"; - } - } - json += "]"; - json += "}"; - /** - * { - * "notify": false, - * "identityList":[ - * '叶洪@84f71856-6447-4714-b616-64949e6e21c0@I', - * '金飞@50ab9f6f-6690-4972-ae50-c5c105316481@I', - * '金飞@50ab9f6f-6690-4972-ae50-c5c105316452@I', - * '昌威@0c5e3d66-3271-4815-b7b4-9be2370ce35ef@I', - * '张剑@c59fc8f0-e04c-4c92-92a9-42321c57883f@I' - * ] - * } - */ - JsonElement data = jsonParser.parse( json ); // 将json字符串转换成JsonElement - ActionResponse resp = ThisApplication.context().applications().postQuery( - x_processplatform_assemble_surface.class, "read/work/" + wf_workId , data - ); - return ; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowStarter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowStarter.java deleted file mode 100644 index c5a0114399..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/dataadapter/workflow/WorkFlowStarter.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.x.okr.assemble.control.dataadapter.workflow; - -import java.io.UnsupportedEncodingException; - -import com.google.gson.JsonElement; -import com.x.base.core.project.x_processplatform_service_processing; -import com.x.base.core.project.connection.ActionResponse; -import com.x.base.core.project.http.WrapOutId; -import com.x.okr.assemble.control.ThisApplication; - -/** - * 启动工作流的服务 - * - * @author O2LEE - */ -public class WorkFlowStarter { - - /** - * 启动一个工作流程，并且返回工作流实例work的ID - * @param data - * @return String - * @throws UnsupportedEncodingException - * @throws Exception - * - * http://dev.o2oa.io:20020/x_processplatform_service_processing/jaxrs/work - * POST - */ - public String start( JsonElement data ) throws UnsupportedEncodingException, Exception { - ActionResponse resp = ThisApplication.context().applications().postQuery( - x_processplatform_service_processing.class, "work", data - ); - WrapOutId wrapOutId = resp.getData( WrapOutId.class ); - return wrapOutId.getId(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrAttachmentFileInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrAttachmentFileInfoFactory.java deleted file mode 100644 index af569d1e48..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrAttachmentFileInfoFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrAttachmentFileInfo_; - -/** - * 类 名：OkrAttachmentFileInfoFactory
- * 实体类：OkrAttachmentFileInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrAttachmentFileInfoFactory extends AbstractFactory { - - public OkrAttachmentFileInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrAttachmentFileInfo实体信息对象" ) - public OkrAttachmentFileInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrAttachmentFileInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrAttachmentFileInfo实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrAttachmentFileInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrAttachmentFileInfo.class); - cq.select(root.get(OkrAttachmentFileInfo_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrAttachmentFileInfo实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrAttachmentFileInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrAttachmentFileInfo.class); - Root root = cq.from(OkrAttachmentFileInfo.class); - Predicate p = root.get(OkrAttachmentFileInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrCenterWorkInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrCenterWorkInfoFactory.java deleted file mode 100644 index eb904495d6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrCenterWorkInfoFactory.java +++ /dev/null @@ -1,440 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrCenterWorkInfo_; - -public class OkrCenterWorkInfoFactory extends AbstractFactory { - - public OkrCenterWorkInfoFactory( Business business ) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrCenterWorkInfo应用信息对象" ) - public OkrCenterWorkInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrCenterWorkInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrCenterWorkInfo应用信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrCenterWorkInfo.class); - cq.select(root.get(OkrCenterWorkInfo_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrCenterWorkInfo应用信息列表" ) - public List list( List ids, List statuses ) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrCenterWorkInfo.class); - Root root = cq.from(OkrCenterWorkInfo.class); - Predicate p = root.get(OkrCenterWorkInfo_.id).in(ids); - if( statuses != null && statuses.size() > 0 ){ - p = cb.and( p, root.get(OkrCenterWorkInfo_.status ).in(statuses) ); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询下一页的信息数据 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings( "unchecked" ) - public List listNextWithFilter( String id, Integer count, Object sequence, WorkCommonQueryFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrCenterWorkInfo.class ); - String order = wrapIn.getOrder();//排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - - if( order == null || order.isEmpty() ){ - order = "DESC"; - } - - Integer index = 1; - sql_stringBuffer.append( "SELECT o FROM "+OkrCenterWorkInfo.class.getCanonicalName()+" o where 1=1" ); - - if ((null != sequence) ) { - sql_stringBuffer.append( " and o." + wrapIn.getSequenceField()+" " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "<" : ">" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ((null != wrapIn.getDefaultWorkTypes()) && wrapIn.getDefaultWorkTypes().size() > 0) { - sql_stringBuffer.append( " and o.defaultWorkType in ( ?" + (index) + " )" ); - vs.add( wrapIn.getDefaultWorkTypes() ); - index++; - } - if ((null != wrapIn.getCenterIds()) && wrapIn.getCenterIds().size() > 0) { - sql_stringBuffer.append( " and o.id in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCenterIds() ); - index++; - } - - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0 ) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%"+wrapIn.getTitle()+"%" ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0 ) { - sql_stringBuffer.append( " and o.status in (?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + ( StringUtils.equalsIgnoreCase( order, "DESC" ) ? "DESC" : "ASC" ) ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrCenterWorkInfo.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询上一页的信息数据 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings( "unchecked" ) - public List listPrevWithFilter( String id, Integer count, Object sequence, WorkCommonQueryFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrCenterWorkInfo.class ); - String order = wrapIn.getOrder();//排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - if( order == null || order.isEmpty() ){ - order = "DESC"; - } - - sql_stringBuffer.append( "SELECT o FROM " + OkrCenterWorkInfo.class.getCanonicalName()+" o where 1=1" ); - if ((null != sequence) ) { - sql_stringBuffer.append( " and o."+wrapIn.getSequenceField()+" " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? ">" : "<" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ((null != wrapIn.getDefaultWorkTypes()) && wrapIn.getDefaultWorkTypes().size() > 0) { - sql_stringBuffer.append( " and o.defaultWorkType in ( ?" + (index) + " )" ); - vs.add( wrapIn.getDefaultWorkTypes() ); - index++; - } - if ((null != wrapIn.getCenterIds()) && wrapIn.getCenterIds().size() > 0) { - sql_stringBuffer.append( " and o.id in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCenterIds() ); - index++; - } - - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0 ) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%"+wrapIn.getTitle()+"%" ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0 ) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + ( StringUtils.equalsIgnoreCase( order, "DESC" ) ? "DESC" : "ASC" ) ); - //logger.debug( "listIdsNextWithFilter:[" +sql_stringBuffer.toString()+ "]" ); - //logger.debug(vs); - - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrCenterWorkInfo.class ); - //为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询符合的信息总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter( WorkCommonQueryFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrCenterWorkInfo.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append( "SELECT count(o.id) FROM "+OkrCenterWorkInfo.class.getCanonicalName()+" o where 1=1" ); - - if ((null != wrapIn.getCenterIds()) && wrapIn.getCenterIds().size() > 0) { - sql_stringBuffer.append( " and o.id in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCenterIds() ); - index++; - } - - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0 ) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - - if ((null != wrapIn.getDefaultWorkTypes()) && wrapIn.getDefaultWorkTypes().size() > 0) { - sql_stringBuffer.append( " and o.defaultWorkType in ( ?" + (index) + " )" ); - vs.add( wrapIn.getDefaultWorkTypes() ); - index++; - } - - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%"+wrapIn.getTitle()+"%" ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0 ) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrCenterWorkInfo.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - - public List listAllProcessingCenterWorkIds( List processStatus, List status ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrCenterWorkInfo.class); - cq.select(root.get( OkrCenterWorkInfo_.id )); - Predicate p = root.get(OkrCenterWorkInfo_.processStatus).in( processStatus ); - if( status != null && status.size() > 0 ){ - p = cb.and( p, root.get( OkrCenterWorkInfo_.status ).in( status ) ); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listAllCenterWorks( String status ) throws Exception { - if( status == null || status.isEmpty() ){ - throw new Exception("status is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrCenterWorkInfo.class); - Root root = cq.from(OkrCenterWorkInfo.class); - Predicate p = cb.equal( root.get( OkrCenterWorkInfo_.status ), status ); - - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询中心工作审核领导身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - public List listAllDistinctAuditLeaderIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrCenterWorkInfo.class ); - - Root root = cq.from(OkrCenterWorkInfo.class); -// cq.select(root.get( OkrCenterWorkInfo_.reportAuditLeaderIdentityList )); - List centerWorkInfos = em.createQuery(cq).getResultList(); - //ListTools.trim(list, ignoreNull, unique, ts); - if(ListTools.isNotEmpty( centerWorkInfos )) { - HashSet hashSet = new HashSet(); - for(OkrCenterWorkInfo centerWorkInfo : centerWorkInfos ) { - - if( ListTools.isNotEmpty( centerWorkInfo.getReportAuditLeaderIdentityList() ) ) { - for( String identity : centerWorkInfo.getReportAuditLeaderIdentityList() ) { - if( ListTools.isNotEmpty(identities_ok) && identities_ok.contains( identity ) ){ - continue; - } - if( ListTools.isNotEmpty(identities_error) && identities_error.contains( identity ) ){ - continue; - } - hashSet.add( identity ); - } - } - } - List result = new ArrayList<>(); - result.addAll(hashSet); - return result; - } - return null; - - } - /** - * 查询中心工作创建者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctCreatorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrCenterWorkInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrCenterWorkInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrCenterWorkInfo_.creatorIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrCenterWorkInfo_.creatorIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrCenterWorkInfo_.creatorIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询中心工作部署者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctDeployerIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrCenterWorkInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrCenterWorkInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrCenterWorkInfo_.deployerIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrCenterWorkInfo_.deployerIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrCenterWorkInfo_.deployerIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询中心工作汇报审核领导身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List listAllDistinctReportAuditLeaderIdentity(List identities_ok, - List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrCenterWorkInfo.class); - Root root = cq.from(OkrCenterWorkInfo.class); - List os = em.createQuery(cq.select(root)).getResultList(); - List allList = new ArrayList<>(); - for (OkrCenterWorkInfo o : os) { - allList.add(o.getReportAuditLeaderIdentityList()); - } - if(ListTools.isNotEmpty( allList )) { - HashSet hashSet = new HashSet(); - for( List identities : allList ) { - if(ListTools.isNotEmpty( identities )) { - for( String identity : identities ) { - if( ListTools.isNotEmpty(identities_ok) && identities_ok.contains( identity ) ){ - continue; - } - if( ListTools.isNotEmpty(identities_error) && identities_error.contains( identity ) ){ - continue; - } - hashSet.add( identity ); - } - } - } - List result = new ArrayList<>(); - result.addAll(hashSet); - return result; - } - return null; - } - - /** - * 根据身份名称，从中心工作信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInCenterInfo( String identity, String recordId ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrCenterWorkInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrCenterWorkInfo.class ); - Root root = cq.from( OkrCenterWorkInfo.class ); - Predicate p = cb.isNotNull(root.get( OkrCenterWorkInfo_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrCenterWorkInfo_.id ), recordId ) ); - } - - Predicate p_creatorIdentity = cb.isNotNull(root.get( OkrCenterWorkInfo_.creatorIdentity )); - p_creatorIdentity = cb.and( p_creatorIdentity, cb.equal( root.get( OkrCenterWorkInfo_.creatorIdentity ), identity ) ); - - Predicate p_deployerIdentity = cb.isNotNull(root.get( OkrCenterWorkInfo_.deployerIdentity )); - p_deployerIdentity = cb.and( p_deployerIdentity, cb.equal( root.get( OkrCenterWorkInfo_.deployerIdentity ), identity ) ); - - Predicate p_reportAuditLeaderIdentity = cb.isNotNull(root.get( OkrCenterWorkInfo_.reportAuditLeaderIdentityList )); - p_reportAuditLeaderIdentity = cb.and( p_reportAuditLeaderIdentity,cb.isMember(identity, root.get( OkrCenterWorkInfo_.reportAuditLeaderIdentityList ))); - - Predicate p_auditLeaderIdentity = cb.isNotNull(root.get( OkrCenterWorkInfo_.reportAuditLeaderIdentityList )); - p_auditLeaderIdentity = cb.and( p_auditLeaderIdentity, cb.isMember( identity, root.get( OkrCenterWorkInfo_.reportAuditLeaderIdentityList ) ) ); - - Predicate p_identity = cb.or( p_creatorIdentity, p_deployerIdentity, p_reportAuditLeaderIdentity, p_auditLeaderIdentity ); - - p = cb.and( p, p_identity ); - - return em.createQuery(cq.where(p)).getResultList(); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSecretaryFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSecretaryFactory.java deleted file mode 100644 index 1725f87473..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSecretaryFactory.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigSecretary; -import com.x.okr.entity.OkrConfigSecretary_; - -public class OkrConfigSecretaryFactory extends AbstractFactory { - - public OkrConfigSecretaryFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrConfigSecretary应用信息对象" ) - public OkrConfigSecretary get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrConfigSecretary.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrConfigSecretary应用信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigSecretary.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrConfigSecretary.class); - cq.select(root.get(OkrConfigSecretary_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrConfigSecretary应用信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrConfigSecretary.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigSecretary.class); - Root root = cq.from(OkrConfigSecretary.class); - Predicate p = root.get(OkrConfigSecretary_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据秘书姓名查询配置好的秘书信息ID列表 - * @param userName - * @return - * @throws Exception - */ - //@MethodDescribe( "根据秘书姓名查询配置好的秘书信息ID列表" ) - public List listBySecretaryName( String userName ) throws Exception { - if( userName == null || userName.isEmpty() ){ - throw new Exception ( "the parameter: 'userName' is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrConfigSecretary.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrConfigSecretary.class); - cq.select(root.get(OkrConfigSecretary_.id)); - Predicate p = cb.equal( root.get(OkrConfigSecretary_.secretaryName ) , userName); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "根据秘书姓名和被代理员工姓名查询配置好的秘书信息ID列表" ) - public List listIdsByPerson( String name, String leaderName ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception ( "the parameter: 'name' is null!" ); - } - if( leaderName == null || leaderName.isEmpty() ){ - throw new Exception ( "the parameter: 'leaderName' is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrConfigSecretary.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrConfigSecretary.class); - cq.select(root.get( OkrConfigSecretary_.id )); - Predicate p = cb.equal( root.get( OkrConfigSecretary_.secretaryName ) , name ); - p = cb.and( p, cb.equal( root.get( OkrConfigSecretary_.leaderName ), leaderName )); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByLeaderIdentity( String name, String leaderIdentity ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception ( "the parameter: 'name' is null!" ); - } - if( leaderIdentity == null || leaderIdentity.isEmpty() ){ - throw new Exception ( "the parameter: 'leaderIdentity' is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrConfigSecretary.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from( OkrConfigSecretary.class); - cq.select(root.get( OkrConfigSecretary_.id )); - Predicate p = cb.equal( root.get( OkrConfigSecretary_.secretaryName ) , name ); - p = cb.and( p, cb.equal( root.get( OkrConfigSecretary_.leaderIdentity ), leaderIdentity )); - return em.createQuery( cq.where(p) ).getResultList(); - } - /** - * 查询秘书代理领导身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctLeaderIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigSecretary.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrConfigSecretary.class); - - Predicate p = cb.isNotNull( root.get( OkrConfigSecretary_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrConfigSecretary_.leaderIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrConfigSecretary_.leaderIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrConfigSecretary_.leaderIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从领导秘书配置信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInConfigSecretary(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigSecretary.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrConfigSecretary.class ); - Root root = cq.from( OkrConfigSecretary.class ); - Predicate p = cb.isNotNull(root.get( OkrConfigSecretary_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrConfigSecretary_.id ), recordId ) ); - } - - Predicate p_leaderIdentity = cb.isNotNull(root.get( OkrConfigSecretary_.leaderIdentity )); - p_leaderIdentity = cb.and( p_leaderIdentity, cb.equal( root.get( OkrConfigSecretary_.leaderIdentity ), identity ) ); - Predicate p_secretaryIdentity = cb.isNotNull(root.get( OkrConfigSecretary_.secretaryIdentity )); - p_secretaryIdentity = cb.and( p_secretaryIdentity, cb.equal( root.get( OkrConfigSecretary_.secretaryIdentity ), identity ) ); - Predicate p_identity = cb.or( p_leaderIdentity, p_secretaryIdentity ); - p = cb.and( p, p_identity ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByIdentities(List identities) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigSecretary.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrConfigSecretary.class); - Predicate p = root.get( OkrConfigSecretary_.secretaryName ).in( identities ); - cq.select(root.get( OkrConfigSecretary_.id )); - return em.createQuery(cq.where(p)).getResultList(); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSystemFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSystemFactory.java deleted file mode 100644 index e76c733899..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigSystemFactory.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigSystem; -import com.x.okr.entity.OkrConfigSystem_; - -/** - * 类 名：OkrConfigSystemFactory
- * 实体类：OkrConfigSystem
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrConfigSystemFactory extends AbstractFactory { - - public OkrConfigSystemFactory(Business business) throws Exception { - super(business); - } - -// @MethodDescribe( "获取指定Id的OkrConfigSystem实体信息对象" ) - public OkrConfigSystem get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrConfigSystem.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrConfigSystem实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigSystem.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigSystem.class); - @SuppressWarnings("unused") - Root root = cq.from( OkrConfigSystem.class); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrConfigSystem实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrConfigSystem.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigSystem.class); - Root root = cq.from(OkrConfigSystem.class); - Predicate p = root.get(OkrConfigSystem_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "根据指定的配置编码获取配置的值" ) - public String getValueWithConfigCode(String configCode) throws Exception { - if( configCode == null || configCode.isEmpty() ){ - throw new Exception( "config code is null, can not find any system config!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrConfigSystem.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrConfigSystem.class); - Predicate p = cb.equal( root.get( OkrConfigSystem_.configCode ), configCode ); - cq.select(root.get(OkrConfigSystem_.configValue)); - //System.out.println("SQL:" + em.createQuery(cq.where(p)).toString() ); - List valueList = em.createQuery(cq.where(p)).getResultList(); - if( valueList != null && valueList.size() > 0 ){ - //System.out.println("valueList.get(0):" + valueList.get(0) ); - return valueList.get(0); - } - return null; - } - - public OkrConfigSystem getWithConfigCode(String configCode) throws Exception { - if( configCode == null || configCode.isEmpty() ){ - throw new Exception( "config code is null, can not find any system config!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrConfigSystem.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigSystem.class); - Root root = cq.from(OkrConfigSystem.class); - Predicate p = cb.equal( root.get( OkrConfigSystem_.configCode ), configCode ); - List valueList = em.createQuery(cq.where(p)).getResultList(); - if( valueList != null && valueList.size() > 0 ){ - return valueList.get(0); - } - return null; - } - /** - * 查询系统配置值身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctValueIdentity( List identities_ok, List identities_error ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigSystem.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrConfigSystem.class); - - Predicate p = cb.isNotNull( root.get( OkrConfigSystem_.id ) ); - p = cb.and( p, cb.equal( root.get( OkrConfigSystem_.valueType ), "identity") ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrConfigSystem_.configValue ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrConfigSystem_.configValue ).in( identities_error )) ); - } - cq.select(root.get( OkrConfigSystem_.configValue )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从系统参数配置信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInConfigSystem(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrConfigSystem.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrConfigSystem.class ); - Root root = cq.from( OkrConfigSystem.class ); - Predicate p = cb.isNotNull(root.get( OkrConfigSystem_.configValue )); - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrConfigSystem_.id ), recordId ) ); - } - //p = cb.and( p, cb.equal( root.get( OkrConfigSystem_.valueType ), "identity") ); - p = cb.and( p, cb.like( root.get( OkrConfigSystem_.configValue ), "%"+identity+"%" ) ); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkLevelFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkLevelFactory.java deleted file mode 100644 index 9279d717c4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkLevelFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigWorkLevel; -import com.x.okr.entity.OkrConfigWorkLevel_; - -/** - * 类 名：OkrConfigWorkLevelFactory
- * 实体类：OkrConfigWorkLevel
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrConfigWorkLevelFactory extends AbstractFactory { - - public OkrConfigWorkLevelFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrConfigWorkLevel实体信息对象" ) - public OkrConfigWorkLevel get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrConfigWorkLevel.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrConfigWorkLevel实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigWorkLevel.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigWorkLevel.class); - @SuppressWarnings("unused") - Root root = cq.from( OkrConfigWorkLevel.class); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrConfigWorkLevel实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrConfigWorkLevel.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigWorkLevel.class); - Root root = cq.from(OkrConfigWorkLevel.class); - Predicate p = root.get(OkrConfigWorkLevel_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkTypeFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkTypeFactory.java deleted file mode 100644 index 6caf5bc66d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrConfigWorkTypeFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigWorkType; -import com.x.okr.entity.OkrConfigWorkType_; - -/** - * 类 名：OkrConfigWorkTypeFactory
- * 实体类：OkrConfigWorkType
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrConfigWorkTypeFactory extends AbstractFactory { - - public OkrConfigWorkTypeFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrConfigWorkType实体信息对象" ) - public OkrConfigWorkType get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrConfigWorkType.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrConfigWorkType实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrConfigWorkType.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigWorkType.class); - @SuppressWarnings("unused") - Root root = cq.from( OkrConfigWorkType.class); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrConfigWorkType实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrConfigWorkType.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrConfigWorkType.class); - Root root = cq.from(OkrConfigWorkType.class); - Predicate p = root.get(OkrConfigWorkType_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrErrorSystemIdentityInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrErrorSystemIdentityInfoFactory.java deleted file mode 100644 index edc8131877..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrErrorSystemIdentityInfoFactory.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrErrorIdentityRecords; -import com.x.okr.entity.OkrErrorIdentityRecords_; -import com.x.okr.entity.OkrErrorSystemIdentityInfo; -import com.x.okr.entity.OkrErrorSystemIdentityInfo_; - -/** - * 类 名：OkrErrorSystemIdentityInfoFactory
- * 实体类：OkrErrorSystemIdentityInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrErrorSystemIdentityInfoFactory extends AbstractFactory { - - public OkrErrorSystemIdentityInfoFactory(Business business) throws Exception { - super(business); - } - -// @MethodDescribe( "获取指定Id的OkrErrorSystemIdentityInfo实体信息对象" ) - public OkrErrorSystemIdentityInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrErrorSystemIdentityInfo.class, ExceptionWhen.none); - } - -// @MethodDescribe( "获取指定Id的OkrErrorIdentityRecords实体信息对象" ) - public OkrErrorIdentityRecords getRecords( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrErrorIdentityRecords.class, ExceptionWhen.none); - } - - public List listByIdentityName(String identity) throws Exception { - if( identity == null || identity.isEmpty() ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get( OkrErrorSystemIdentityInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrErrorSystemIdentityInfo.class); - Root root = cq.from(OkrErrorSystemIdentityInfo.class); - Predicate p = cb.equal( root.get(OkrErrorSystemIdentityInfo_.identity), identity ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listRecordsByIdentityName(String identity) throws Exception { - if( identity == null || identity.isEmpty() ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get( OkrErrorIdentityRecords.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrErrorIdentityRecords.class); - Root root = cq.from(OkrErrorIdentityRecords.class); - Predicate p = cb.equal( root.get(OkrErrorIdentityRecords_.identity), identity ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listNotFlag(String flag) throws Exception { - if( flag == null || flag.isEmpty() ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get( OkrErrorSystemIdentityInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrErrorSystemIdentityInfo.class); - Root root = cq.from(OkrErrorSystemIdentityInfo.class); - Predicate p = cb.notEqual( root.get(OkrErrorSystemIdentityInfo_.flag), flag ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listRecordNotFlag(String flag) throws Exception { - if( flag == null || flag.isEmpty() ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get( OkrErrorIdentityRecords.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrErrorIdentityRecords.class); - Root root = cq.from(OkrErrorIdentityRecords.class); - Predicate p = cb.notEqual( root.get(OkrErrorIdentityRecords_.flag), flag ); - return em.createQuery(cq.where(p)).getResultList(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportContentFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportContentFactory.java deleted file mode 100644 index a64abdc8fa..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportContentFactory.java +++ /dev/null @@ -1,390 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportContent_; - -/** - * 类 名：OkrStatisticReportContent
- * 实体类：OkrStatisticReportContent
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrStatisticReportContentFactory extends AbstractFactory { - - public OkrStatisticReportContentFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrStatisticReportContent实体信息对象" ) - public OkrStatisticReportContent get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrStatisticReportContent.class, ExceptionWhen.none); - } - -// @MethodDescribe( "根据中心工作，年份，月份，周数查询指定实体信息ID列表" ) - public List list( String workId, Integer year, Integer month, Integer week, String cycleType ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = cb.equal( root.get(OkrStatisticReportContent_.workId ), workId ); - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - cq.select( root.get( OkrStatisticReportContent_.id ) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "根据中心工作，年份，月份，周数查询指定实体信息ID列表" ) - public Long count( String workId, Integer year, Integer month, Integer week, String cycleType ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( Long.class ); - Root root = cq.from( OkrStatisticReportContent.class ); - Predicate p = cb.equal( root.get(OkrStatisticReportContent_.workId ), workId ); - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - cq.select( cb.count(root) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - /** - * 根据条件获取统计信息列表 - * @param workTypeName - * @param reportCycle - * @param year - * @param month - * @param week - * @return - * @throws Exception - */ - public List list( String centerId, String centerTitle, String parentId, String workType, String statisticTime, String cycleType, Integer year, Integer month, Integer week, String status ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = cb.isNotNull( root.get(OkrStatisticReportContent_.id ) ); - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.centerId ), centerId )); - } - if( centerTitle != null && !centerTitle.trim().isEmpty() ){ - p = cb.and( p, cb.like( root.get(OkrStatisticReportContent_.centerTitle ), "%" + centerTitle.trim() + "%" )); - } - if( parentId != null && !parentId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.parentId ), parentId )); - } - if( workType != null && !workType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workType ), workType )); - } - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.status ), status )); - } - if( statisticTime != null && !statisticTime.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticTimeFlag ), statisticTime )); - } - cq.select( root.get( OkrStatisticReportContent_.id ) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据条件获取统计信息列表 - * @param workTypeName - * @param reportCycle - * @param year - * @param month - * @param week - * @return - * @throws Exception - */ - public List listFirstLayer( String centerId, String centerTitle, String workId, String workType, String statisticTimeFlag, String cycleType, Integer year, Integer month, Integer week, String status ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = cb.isNotNull( root.get(OkrStatisticReportContent_.id ) ); - p = cb.and( p, cb.isNull( root.get(OkrStatisticReportContent_.parentId ))); - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.centerId ), centerId )); - } - if( centerTitle != null && !centerTitle.trim().isEmpty() ){ - p = cb.and( p, cb.like( root.get(OkrStatisticReportContent_.centerTitle ), "%" + centerTitle.trim() + "%" )); - } - if( workId != null && !workId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workId ), workId )); - } - if( workType != null && !workType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workType ), workType )); - } - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.status ), status )); - } - if( statisticTimeFlag != null && !statisticTimeFlag.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticTimeFlag ), statisticTimeFlag )); - } - cq.select( root.get( OkrStatisticReportContent_.id ) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据条件获取统计信息列表 - * @param workTypeName - * @param reportCycle - * @param year - * @param month - * @param week - * @return - * @throws Exception - */ - public Long count( String centerId, String centerTitle, String parentId, String workType, String statisticTime, String cycleType, Integer year, Integer month, Integer week, String status ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( Long.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = cb.isNotNull( root.get( OkrStatisticReportContent_.id ) ); - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.centerId ), centerId )); - } - if( centerTitle != null && !centerTitle.trim().isEmpty() ){ - p = cb.and( p, cb.like( root.get(OkrStatisticReportContent_.centerTitle ), "%" + centerTitle.trim() + "%" )); - } - if( parentId != null && !parentId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.parentId ), parentId )); - } - if( workType != null && !workType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workType ), workType )); - } - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.status ), status )); - } - if( statisticTime != null && !statisticTime.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticTimeFlag ), statisticTime )); - } - cq.select( cb.count(root) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long countFirstLayer( String centerId, String centerTitle, String workId, String workType, String statisticTime, String cycleType, Integer year, Integer month, Integer week, String status ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( Long.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = cb.isNotNull( root.get( OkrStatisticReportContent_.id ) ); - p = cb.and( p, cb.isNull( root.get(OkrStatisticReportContent_.parentId ))); - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.centerId ), centerId )); - } - if( centerTitle != null && !centerTitle.trim().isEmpty() ){ - p = cb.and( p, cb.like( root.get(OkrStatisticReportContent_.centerTitle ), "%" + centerTitle.trim() + "%" )); - } - if( workType != null && !workType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workType ), workType )); - } - if( workId != null && !workId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workId ), workId )); - } - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.status ), status )); - } - if( statisticTime != null && !statisticTime.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticTimeFlag ), statisticTime )); - } - cq.select( cb.count(root) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public List list( List ids ) throws Exception { - if( ids == null || ids.isEmpty() ){ - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrStatisticReportContent.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = root.get(OkrStatisticReportContent_.id ).in( ids ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listDateTimeFlags(String centerId, String centerTitle, String workId, String workType, String cycleType, Integer year, Integer month, Integer week, Date startDate, Date endDate, String status) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportContent.class); - Predicate p = cb.isNotNull( root.get( OkrStatisticReportContent_.id ) ); - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.centerId ), centerId )); - } - if( centerTitle != null && !centerTitle.trim().isEmpty() ){ - p = cb.and( p, cb.like( root.get(OkrStatisticReportContent_.centerTitle ), "%" + centerTitle.trim() + "%" )); - } - if( workId != null && !workId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workId ), workId )); - } - if( workType != null && !workType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.workType ), workType )); - } - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.cycleType ), cycleType )); - } - if( year != null && year > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticYear ), year )); - } - if( month != null && month > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticMonth ), month )); - } - if( week != null && week > 0 ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.statisticWeek ), week )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportContent_.status ), status )); - } - if( startDate != null ){ - p = cb.and( p, cb.greaterThan( root.get(OkrStatisticReportContent_.statisticTime ), startDate)); - } - if( endDate != null ){ - p = cb.and( p, cb.lessThan( root.get(OkrStatisticReportContent_.statisticTime ), endDate)); - } - cq.select( root.get(OkrStatisticReportContent_.statisticTimeFlag )); - return em.createQuery( cq.where(p) ).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询统计数据中工作责任者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctResponsibilityIdentity( List identities_ok, List identities_error ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportContent.class); - - Predicate p = cb.isNotNull( root.get( OkrStatisticReportContent_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrStatisticReportContent_.responsibilityIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrStatisticReportContent_.responsibilityIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrStatisticReportContent_.responsibilityIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从工作最新汇报内容统计信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInStReportContent(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrStatisticReportContent.class ); - Root root = cq.from( OkrStatisticReportContent.class ); - Predicate p = cb.isNotNull(root.get( OkrStatisticReportContent_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrStatisticReportContent_.id ), recordId ) ); - } - - Predicate p_responsibilityIdentity = cb.isNotNull(root.get( OkrStatisticReportContent_.responsibilityIdentity )); - p_responsibilityIdentity = cb.and( p_responsibilityIdentity, cb.equal( root.get( OkrStatisticReportContent_.responsibilityIdentity ), identity ) ); - p = cb.and( p, p_responsibilityIdentity ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportContent.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportContent.class); - cq.select(root.get( OkrStatisticReportContent_.id )); - return em.createQuery(cq).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportStatusFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportStatusFactory.java deleted file mode 100644 index f46b776d6a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrStatisticReportStatusFactory.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrStatisticReportStatus_; - -/** - * 类 名：OkrStatisticReportStatusFactory
- * 实体类：OkrStatisticReportStatus
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrStatisticReportStatusFactory extends AbstractFactory { - - public OkrStatisticReportStatusFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrStatisticReportStatus实体信息对象" ) - public OkrStatisticReportStatus get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrStatisticReportStatus.class ); - } - - //@MethodDescribe( "获取指定Id的OkrStatisticReportStatus实体信息对象" ) - public List listWithWorkId( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrStatisticReportStatus.class); - Root root = cq.from(OkrStatisticReportStatus.class); - Predicate p = cb.equal( root.get(OkrStatisticReportStatus_.workId), workId ); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "列示全部的OkrStatisticReportStatus实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrStatisticReportStatus.class); - @SuppressWarnings("unused") - Root root = cq.from( OkrStatisticReportStatus.class); - return em.createQuery(cq).getResultList(); - } - - public List listAllIds() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrStatisticReportStatus.class); - cq.select(root.get(OkrStatisticReportStatus_.id) ); - return em.createQuery(cq).getResultList(); - } - -// @MethodDescribe( "列示指定Id的OkrStatisticReportStatus实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrStatisticReportStatus.class); - Root root = cq.from(OkrStatisticReportStatus.class); - Predicate p = root.get(OkrStatisticReportStatus_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List list( String centerId, String centerTitle, String workId, String workType, String unitName, String cycleType, String status ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrStatisticReportStatus.class); - Root root = cq.from(OkrStatisticReportStatus.class); - Predicate p = cb.isNotNull( root.get(OkrStatisticReportStatus_.id) ); - - if( workType != null && !workType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.workType ), workType )); - } - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.reportCycle ), cycleType )); - } - if( centerTitle != null && !centerTitle.isEmpty() ){ - p = cb.and( p, cb.like( root.get( OkrStatisticReportStatus_.centerTitle ), "%"+centerTitle+"%" )); - } - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.centerId ), centerId )); - } - if( workId != null && !workId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.workId ), workId )); - } - if( status != null && !"All".equals(status) ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.status ), status )); - } - if( unitName != null && !unitName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.responsibilityUnitName ), unitName )); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIds(String centerId, String workId, String unitName, String cycleType, String status) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrStatisticReportStatus.class); - Predicate p = cb.isNotNull( root.get(OkrStatisticReportStatus_.id) ); - - if( cycleType != null && !cycleType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.reportCycle ), cycleType )); - } - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.centerId ), centerId )); - } - if( workId != null && !workId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.workId ), workId )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.status ), status )); - } - if( unitName != null && !unitName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrStatisticReportStatus_.responsibilityUnitName ), unitName )); - } - cq.select(root.get(OkrStatisticReportStatus_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询统计数据中工作责任者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctResponsibilityIdentity( List identities_ok, List identities_error ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrStatisticReportStatus.class); - - Predicate p = cb.isNotNull( root.get( OkrStatisticReportStatus_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrStatisticReportStatus_.responsibilityIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrStatisticReportStatus_.responsibilityIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrStatisticReportStatus_.responsibilityIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据身份名称，从工作汇报状态统计信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInStReportStatus(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrStatisticReportStatus.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrStatisticReportStatus.class ); - Root root = cq.from( OkrStatisticReportStatus.class ); - Predicate p = cb.isNotNull(root.get( OkrStatisticReportStatus_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrStatisticReportStatus_.id ), recordId ) ); - } - - Predicate p_responsibilityIdentity = cb.isNotNull(root.get( OkrStatisticReportStatus_.responsibilityIdentity )); - p_responsibilityIdentity = cb.and( p_responsibilityIdentity, cb.equal( root.get( OkrStatisticReportStatus_.responsibilityIdentity ), identity ) ); - p = cb.and( p, p_responsibilityIdentity ); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskFactory.java deleted file mode 100644 index 9b5dac96d5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskFactory.java +++ /dev/null @@ -1,380 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTask_; - -/** - * 类 名：OkrTaskFactory
- * 实体类：OkrTask
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrTaskFactory extends AbstractFactory { - - public OkrTaskFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrTask实体信息对象" ) - public OkrTask get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrTask.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrTask实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrTask.class); - cq.select(root.get(OkrTask_.id)); - return em.createQuery(cq).getResultList(); - } - -// @MethodDescribe( "列示指定Id的OkrTask实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrTask.class); - Root root = cq.from(OkrTask.class); - Predicate p = root.get(OkrTask_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "根据工作ID，处理人，处理环节名称查询一下是否存在待办信息" ) - public List listIdsByWorkAndTarget(String workId, String targetName, String activityName) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( " workId is null!" ); - } - if( targetName == null || targetName.isEmpty() ){ - throw new Exception( " targetName is null!" ); - } - if( activityName == null || activityName.isEmpty() ){ - throw new Exception( " activityName is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.workId), workId); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetName), targetName)); - p = cb.and( p, cb.equal( root.get( OkrTask_.activityName), activityName)); - cq.select(root.get( OkrTask_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "查询在中心中工作是否有指定员工的待办信息" ) - public List listIdsByCenterAndPerson(String centerId, String identity, String dynamicObjectType ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - if( identity == null || identity.isEmpty()){ - throw new Exception( " identity is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.centerId ), centerId ); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), identity) ); - if( dynamicObjectType != null && !dynamicObjectType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.dynamicObjectType ), dynamicObjectType) ); - } - cq.select(root.get(OkrTask_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.centerId ), centerId ); - cq.select(root.get(OkrTask_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，列示所有的数据信息 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，列示所有的数据信息" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrTask.class); - Predicate p = cb.equal( root.get(OkrTask_.workId), workId ); - cq.select(root.get( OkrTask_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByCenterAndIdentityActivity( String dynamicObjectType, String dynamicObjectId, String identity, String processType, String activityName) throws Exception { - if( dynamicObjectType == null || dynamicObjectType.isEmpty() ){ - throw new Exception( " dynamicObjectType is null!" ); - } - if( dynamicObjectId == null || dynamicObjectId.isEmpty()){ - throw new Exception( " dynamicObjectId is null!" ); - } - if( identity == null || identity.isEmpty()){ - throw new Exception( " identity is null!" ); - } - if( processType == null || processType.isEmpty()){ - throw new Exception( " processType is null!" ); - } - if( activityName == null || activityName.isEmpty()){ - throw new Exception( " activityName is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.dynamicObjectType ), dynamicObjectType ); - p = cb.and( p, cb.equal( root.get( OkrTask_.dynamicObjectId ), dynamicObjectId) ); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), identity) ); - p = cb.and( p, cb.equal( root.get( OkrTask_.processType ), processType) ); - p = cb.and( p, cb.equal( root.get( OkrTask_.activityName ), activityName) ); - cq.select(root.get(OkrTask_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByTargetActivityAndObjId( String processType, String dynamicObjectType, String dynamicObjectId, String activityName, String processorIdentity ) throws Exception { - if( dynamicObjectType == null || dynamicObjectType.isEmpty() ){ - throw new Exception( " dynamicObjectType is null!" ); - } - if( dynamicObjectId == null || dynamicObjectId.isEmpty()){ - throw new Exception( " dynamicObjectId is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.dynamicObjectId ), dynamicObjectId ); - if( dynamicObjectType != null && !dynamicObjectType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.dynamicObjectType ), dynamicObjectType) ); - } - if( processType != null && !processType.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.processType ), processType) ); - } - if( activityName != null && !activityName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.activityName ), activityName) ); - } - if( processorIdentity != null && !processorIdentity.isEmpty()){ - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), processorIdentity) ); - } - cq.select(root.get(OkrTask_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listDistinctIdentity(List taskTypeList) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrTask.class); - cq.select( root.get( OkrTask_.targetIdentity )); - Predicate p = root.get( OkrTask_.dynamicObjectType ).in( taskTypeList ); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据待办类别和用户身份，查询待办数量 - * @param taskTypeList - * @param userIdentity - * @return - * @throws Exception - */ - public Long getTaskCount( List taskTypeList, String userIdentity, String workTypeName ) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrTask.class); - Predicate p = root.get( OkrTask_.dynamicObjectType ).in( taskTypeList ); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), userIdentity ) ); - if( workTypeName != null && !workTypeName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.workType ), workTypeName ) ); - } - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getNotReportConfirmTaskCount(List taskTypeList, String userIdentity, String workTypeName) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrTask.class); - Predicate p = root.get( OkrTask_.dynamicObjectType ).in( taskTypeList ); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), userIdentity ) ); - p = cb.and( p, cb.notEqual( root.get( OkrTask_.activityName ), "汇报确认" ) ); - if( workTypeName != null && !workTypeName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.workType ), workTypeName ) ); - } - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - /** - * 根据待办类别和用户身份，查询待办列表 - * @param taskTypeList - * @param userIdentity - * @return - * @throws Exception - */ - public List listTaskByTaskType( List taskTypeList, String userIdentity, String workTypeName ) throws Exception { - List okrTaskList = null; - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< OkrTask > cq = cb.createQuery( OkrTask.class ); - Root root = cq.from( OkrTask.class); - Predicate p = root.get( OkrTask_.dynamicObjectType ).in( taskTypeList ); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), userIdentity ) ); - p = cb.and( p, cb.equal( root.get( OkrTask_.processType ), "TASK" ) ); - if( workTypeName != null && !workTypeName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.workType ), workTypeName ) ); - } - okrTaskList = em.createQuery(cq.where(p)).getResultList(); - if( okrTaskList == null ){ - return null; - }else{ - return okrTaskList; - } - } - - /** - * 根据待办类别和用户身份，查询待办列表 - * @param taskTypeList - * @param userIdentity - * @return - * @throws Exception - */ - public List listReadByTaskType( List taskTypeList, String userIdentity, String workTypeName ) throws Exception { - List okrTaskList = null; - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< OkrTask > cq = cb.createQuery( OkrTask.class ); - Root root = cq.from( OkrTask.class); - Predicate p = root.get( OkrTask_.dynamicObjectType ).in( taskTypeList ); - p = cb.and( p, cb.equal( root.get( OkrTask_.targetIdentity ), userIdentity ) ); - p = cb.and( p, cb.equal( root.get( OkrTask_.processType ), "READ" ) ); - if( workTypeName != null && !workTypeName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.workType ), workTypeName ) ); - } - okrTaskList = em.createQuery(cq.where(p)).getResultList(); - if( okrTaskList == null ){ - return null; - }else{ - return okrTaskList; - } - } - - /** - * 根据用户唯一标识来查询用户信息 - * @param taskTypeList - * @param name - * @return - * @throws Exception - */ - public Long getTaskCountByUserName( List taskTypeList, List notInTaskTypeList, String name) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrTask.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.targetName ), name ); - if( taskTypeList != null && !taskTypeList.isEmpty() ){ - p = cb.and( p, root.get( OkrTask_.dynamicObjectType ).in( taskTypeList ) ); - } - if( notInTaskTypeList != null && !notInTaskTypeList.isEmpty() ){ - p = cb.and( p, cb.not( root.get( OkrTask_.dynamicObjectType ).in( notInTaskTypeList ) ) ); - } - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public List listIdsByReportId(String id) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( " id is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTask.class); - Predicate p = cb.equal( root.get( OkrTask_.dynamicObjectId ), id ); - p = cb.and(p, cb.equal( root.get( OkrTask_.dynamicObjectType), "工作汇报")); - cq.select(root.get( OkrTask_.id )); - return em.createQuery(cq.where(p)).setMaxResults(5000).getResultList(); - } - /** - * 查询待办处理者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctTargetIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrTask.class); - - Predicate p = cb.isNotNull( root.get( OkrTask_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrTask_.targetIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrTask_.targetIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrTask_.targetIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从具体工作待办待阅信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkTask(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTask.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrTask.class ); - Root root = cq.from( OkrTask.class ); - Predicate p = cb.isNotNull(root.get( OkrTask_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrTask_.id ), recordId ) ); - } - - Predicate p_targetIdentity = cb.isNotNull(root.get( OkrTask_.targetIdentity )); - p_targetIdentity = cb.and( p_targetIdentity, cb.equal( root.get( OkrTask_.targetIdentity ), identity ) ); - p = cb.and( p, p_targetIdentity ); - return em.createQuery(cq.where(p)).getResultList(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskHandledFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskHandledFactory.java deleted file mode 100644 index 0c1a68c4b6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrTaskHandledFactory.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrTaskHandled_; - -/** - * 类 名：OkrTaskHandledFactory
- * 实体类：OkrTaskHandled
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrTaskHandledFactory extends AbstractFactory { - - public OkrTaskHandledFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrTaskHandled实体信息对象" ) - public OkrTaskHandled get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrTaskHandled.class, ExceptionWhen.none); - } - -// @MethodDescribe( "列示全部的OkrTaskHandled实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTaskHandled.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrTaskHandled.class); - cq.select(root.get(OkrTaskHandled_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrTaskHandled实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrTaskHandled.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrTaskHandled.class); - Root root = cq.from(OkrTaskHandled.class); - Predicate p = root.get(OkrTaskHandled_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrTaskHandled.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTaskHandled.class); - Predicate p = cb.equal( root.get( OkrTaskHandled_.centerId ), centerId ); - cq.select(root.get(OkrTaskHandled_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，列示所有的数据信息 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，列示所有的数据信息" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTaskHandled.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrTaskHandled.class); - Predicate p = cb.equal( root.get( OkrTaskHandled_.workId), workId ); - cq.select(root.get( OkrTaskHandled_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByReportId(String id) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( " id is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrTaskHandled.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrTaskHandled.class); - Predicate p = cb.equal( root.get( OkrTaskHandled_.dynamicObjectId), id); - p = cb.and(p, cb.equal( root.get( OkrTaskHandled_.dynamicObjectType), "工作汇报") ); - cq.select(root.get( OkrTaskHandled_.id)); - return em.createQuery(cq.where(p)).setMaxResults(5000).getResultList(); - } - /** - * 查询已办处理者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctTargetIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrTaskHandled.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrTaskHandled.class); - - Predicate p = cb.isNotNull( root.get( OkrTaskHandled_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrTaskHandled_.targetIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrTaskHandled_.targetIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrTaskHandled_.targetIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从具体工作已办已阅信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInTaskhandled(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrTaskHandled.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrTaskHandled.class ); - Root root = cq.from( OkrTaskHandled.class ); - Predicate p = cb.isNotNull(root.get( OkrTaskHandled_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrTaskHandled_.id ), recordId ) ); - } - - Predicate p_targetIdentity = cb.isNotNull(root.get( OkrTaskHandled_.targetIdentity )); - p_targetIdentity = cb.and( p_targetIdentity, cb.equal( root.get( OkrTaskHandled_.targetIdentity ), identity ) ); - p = cb.and( p, p_targetIdentity ); - return em.createQuery(cq.where(p)).getResultList(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrUserInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrUserInfoFactory.java deleted file mode 100644 index e5800a03a9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrUserInfoFactory.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrUserInfo; -import com.x.okr.entity.OkrUserInfo_; - -/** - * 类 名：OkrUserInfoFactory
- * 实体类：OkrUserInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrUserInfoFactory extends AbstractFactory { - - public OkrUserInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrUserInfo实体信息对象" ) - public OkrUserInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrUserInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrUserInfo实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrUserInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrUserInfo.class); - @SuppressWarnings("unused") - Root root = cq.from( OkrUserInfo.class); - return em.createQuery(cq).getResultList(); - } - - public List listAllIds() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrUserInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrUserInfo.class); - cq.select(root.get(OkrUserInfo_.id) ); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrUserInfo实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrUserInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrUserInfo.class); - Root root = cq.from(OkrUserInfo.class); - Predicate p = root.get(OkrUserInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "列示指定userName的OkrUserInfo实体信息列表" ) - public List listWithPerson( String userName ) throws Exception { - if( userName == null || userName.isEmpty() ){ - throw new Exception("username is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrUserInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrUserInfo.class); - Root root = cq.from(OkrUserInfo.class); - Predicate p = cb.equal( root.get(OkrUserInfo_.userName), userName ); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAppraiseInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAppraiseInfoFactory.java deleted file mode 100644 index 7355c48939..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAppraiseInfoFactory.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkAppraiseInfo; -import com.x.okr.entity.OkrWorkAppraiseInfo_; - -public class OkrWorkAppraiseInfoFactory extends AbstractFactory { - - public OkrWorkAppraiseInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkAppraiseInfo应用信息对象" ) - public OkrWorkAppraiseInfo get(String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkAppraiseInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示指定Id的OkrWorkAppraiseInfo应用信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAppraiseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkAppraiseInfo.class); - Root root = cq.from(OkrWorkAppraiseInfo.class); - Predicate p = root.get(OkrWorkAppraiseInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "根据工作ID列示指定Id的OkrWorkAppraiseInfo应用信息列表" ) - public List listIdsWithWorkId(String workId ) throws Exception { - if( StringUtils.isEmpty( workId )){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAppraiseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkAppraiseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkAppraiseInfo_.workId), workId ); - cq.select( root.get(OkrWorkAppraiseInfo_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - //@MethodDescribe( "根据工作ID列示指定Id的OkrWorkAppraiseInfo应用信息列表" ) - public List listIdsWithWorkId(String workId, String wf_workId ) throws Exception { - if( StringUtils.isEmpty( workId )){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAppraiseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkAppraiseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkAppraiseInfo_.workId), workId ); - p = cb.and( p, cb.equal( root.get(OkrWorkAppraiseInfo_.wf_workId ), wf_workId ) ); - cq.select( root.get(OkrWorkAppraiseInfo_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAuthorizeRecordFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAuthorizeRecordFactory.java deleted file mode 100644 index 15008c1e38..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkAuthorizeRecordFactory.java +++ /dev/null @@ -1,280 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkAuthorizeRecord_; - -/** - * 类 名：OkrWorkAuthorizeRecordFactory
- * 实体类：OkrWorkAuthorizeRecord
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkAuthorizeRecordFactory extends AbstractFactory { - - public OkrWorkAuthorizeRecordFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkAuthorizeRecord实体信息对象" ) - public OkrWorkAuthorizeRecord get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkAuthorizeRecord.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkAuthorizeRecord实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkAuthorizeRecord.class); - cq.select(root.get(OkrWorkAuthorizeRecord_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkAuthorizeRecord实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkAuthorizeRecord.class); - Root root = cq.from(OkrWorkAuthorizeRecord.class); - Predicate p = root.get(OkrWorkAuthorizeRecord_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkAuthorizeRecord.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< String > cq = cb.createQuery( String.class ); - Root< OkrWorkAuthorizeRecord > root = cq.from( OkrWorkAuthorizeRecord.class ); - Predicate p = cb.equal( root.get( OkrWorkAuthorizeRecord_.centerId ), centerId ); - cq.select( root.get( OkrWorkAuthorizeRecord_.id ) ); - return em.createQuery( cq.where(p) ).getResultList(); - } - - /** - * 根据工作信息ID，列示所有的数据信息 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，列示所有的数据信息" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkAuthorizeRecord.class); - Predicate p = cb.equal( root.get(OkrWorkAuthorizeRecord_.workId), workId ); - cq.select(root.get( OkrWorkAuthorizeRecord_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - //@MethodDescribe( "根据工作ID获取工作最大的授权级别" ) - public Integer getMaxDelegateLevel( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkAuthorizeRecord.class ); - Root root = cq.from( OkrWorkAuthorizeRecord.class); - - cq.orderBy( cb.desc( root.get( OkrWorkAuthorizeRecord_.delegateLevel ) ) ); - - Predicate p = cb.equal( root.get( OkrWorkAuthorizeRecord_.workId), workId); - - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return 0; - }else{ - return resultList.get(0).getDelegateLevel(); - } - } - - /** - * 根据工作授权人身份获取第一次授权记录信息 - * @param workId - * @param authorizeIdentity - * @return - * @throws Exception - */ - public OkrWorkAuthorizeRecord getFirstAuthorizeRecord( String workId, String authorizeIdentity ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - if( authorizeIdentity == null || authorizeIdentity.isEmpty() ){ - throw new Exception( "authorizeIdentity is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkAuthorizeRecord.class ); - Root root = cq.from( OkrWorkAuthorizeRecord.class); - cq.orderBy( cb.asc( root.get( OkrWorkAuthorizeRecord_.delegateLevel ) ) ); - Predicate p = cb.equal( root.get( OkrWorkAuthorizeRecord_.workId), workId); - p = cb.and( p, cb.equal( root.get( OkrWorkAuthorizeRecord_.delegatorIdentity ), authorizeIdentity)); - p = cb.and( p, cb.equal( root.get( OkrWorkAuthorizeRecord_.status ), "正常")); - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return null; - }else{ - return resultList.get(0); - } - } - - /** - * 根据工作, 承担人获取最后的一次有效授权记录信息 - * @param workId - * @param undertakerIdentity 可以为空 - * @return - * @throws Exception - */ - public OkrWorkAuthorizeRecord getLastAuthorizeRecord( String workId, String identity, String status ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkAuthorizeRecord.class ); - Root root = cq.from( OkrWorkAuthorizeRecord.class); - - cq.orderBy( cb.desc( root.get( OkrWorkAuthorizeRecord_.delegateLevel ) ) ); - - Predicate p = cb.equal( root.get( OkrWorkAuthorizeRecord_.workId ), workId ); - - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkAuthorizeRecord_.status ), status )); - } - if( identity != null ){ - Predicate p1 = cb.equal( root.get( OkrWorkAuthorizeRecord_.targetIdentity), identity); - p1 = cb.or( p1, cb.equal( root.get( OkrWorkAuthorizeRecord_.delegatorIdentity ), identity)); - p = cb.and( p, p1 ); - } - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return null; - }else{ - return resultList.get(0); - } - } - - public List listByAuthorizor( String workId, String delegatorIdentity, Integer delegateLevel ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkAuthorizeRecord.class); - Predicate p = cb.equal( root.get(OkrWorkAuthorizeRecord_.workId), workId ); - if( delegatorIdentity != null && !delegatorIdentity.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkAuthorizeRecord_.delegatorIdentity ), delegatorIdentity)); - } - if( delegateLevel != null && delegateLevel > 0 ){ - p = cb.and( p, cb.greaterThanOrEqualTo( root.get( OkrWorkAuthorizeRecord_.delegateLevel ), delegateLevel )); - } - cq.select( root.get( OkrWorkAuthorizeRecord_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询工作授权者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctDelegatorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkAuthorizeRecord.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkAuthorizeRecord_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkAuthorizeRecord_.delegatorIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkAuthorizeRecord_.delegatorIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkAuthorizeRecord_.delegatorIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询工作承接者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctTargetIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkAuthorizeRecord.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkAuthorizeRecord_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkAuthorizeRecord_.targetIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkAuthorizeRecord_.targetIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkAuthorizeRecord_.targetIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从工作授权信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInAuthorizeRecord(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkAuthorizeRecord.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkAuthorizeRecord.class ); - Root root = cq.from( OkrWorkAuthorizeRecord.class ); - Predicate p = cb.isNotNull(root.get( OkrWorkAuthorizeRecord_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrWorkAuthorizeRecord_.id ), recordId ) ); - } - - Predicate p_delegatorIdentity = cb.isNotNull(root.get( OkrWorkAuthorizeRecord_.delegatorIdentity )); - p_delegatorIdentity = cb.and( p_delegatorIdentity, cb.equal( root.get( OkrWorkAuthorizeRecord_.delegatorIdentity ), identity ) ); - - Predicate p_targetIdentity = cb.isNotNull(root.get( OkrWorkAuthorizeRecord_.targetIdentity )); - p_targetIdentity = cb.and( p_targetIdentity, cb.equal( root.get( OkrWorkAuthorizeRecord_.targetIdentity ), identity ) ); - - Predicate p_identity = cb.or( p_delegatorIdentity, p_targetIdentity ); - - p = cb.and( p, p_identity ); - - return em.createQuery(cq.where(p)).getResultList(); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkBaseInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkBaseInfoFactory.java deleted file mode 100644 index 804d0deec9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkBaseInfoFactory.java +++ /dev/null @@ -1,842 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.WrapInFilter; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkBaseInfo_; - -public class OkrWorkBaseInfoFactory extends AbstractFactory { - - public OkrWorkBaseInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkBaseInfo应用信息对象" ) - public OkrWorkBaseInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkBaseInfo.class, ExceptionWhen.none); - } - -// @MethodDescribe( "列示全部的OkrWorkBaseInfo应用信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkBaseInfo.class); - cq.select(root.get(OkrWorkBaseInfo_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkBaseInfo应用信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkBaseInfo.class); - Root root = cq.from(OkrWorkBaseInfo.class); - Predicate p = root.get(OkrWorkBaseInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，查询该工作信息的所有下级工作ID - * @param id - * @return - * @throws Exception - */ - //@MethodDescribe( "列示指定Id的OkrWorkBaseInfo应用信息列表" ) - public List getSubNormalWorkBaseInfoIds( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - return new ArrayList(); - } - List status = new ArrayList<>(); - status.add( "正常" ); - status.add( "已归档" ); - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkBaseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkBaseInfo_.parentWorkId ), id ); - p = cb.and( p, root.get(OkrWorkBaseInfo_.status ).in( status )); - cq.select(root.get(OkrWorkBaseInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，查询该工作信息的所有下级工作ID - * @param id - * @return - * @throws Exception - */ - //@MethodDescribe( "列示指定Id的OkrWorkBaseInfo应用信息列表" ) - public List getSubAbnormalWorkBaseInfoIds( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkBaseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkBaseInfo_.parentWorkId ), id ); - p = cb.and( p, cb.notEqual( root.get(OkrWorkBaseInfo_.status ), "正常" )); - cq.select(root.get(OkrWorkBaseInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询下一页的信息数据 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings( "unchecked" ) - public List listNextWithFilter( String id, Integer count, Object sequence, WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - String order = wrapIn.getOrder();//排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - - if( order == null || order.isEmpty() ){ - order = "DESC"; - } - - Integer index = 1; - sql_stringBuffer.append( "SELECT o FROM "+OkrWorkBaseInfo.class.getCanonicalName()+" o where 1=1" ); - - if ((null != sequence) ) { - sql_stringBuffer.append( " and o."+wrapIn.getSequenceField()+" " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "<" : ">" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ((null != wrapIn.getWorkIds()) && wrapIn.getWorkIds().size() > 0) { - sql_stringBuffer.append( " and o.id in ( ?" + (index) + " )" ); - vs.add( wrapIn.getWorkIds() ); - index++; - } - if ((null != wrapIn.getCreatorNames()) && wrapIn.getCreatorNames().size() > 0) { - sql_stringBuffer.append( " and o.creatorName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorNames() ); - index++; - } - if (null != wrapIn.getCreatorUnitNames() && wrapIn.getCreatorUnitNames().size()>0) { - sql_stringBuffer.append( " and o.creatorUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorUnitNames() ); - index++; - } - if (null != wrapIn.getCreatorTopUnitNames() && wrapIn.getCreatorTopUnitNames().size() > 0 ) { - sql_stringBuffer.append( " and o.creatorTopUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorTopUnitNames() ); - index++; - } - if ((null != wrapIn.getDeployerNames()) && wrapIn.getDeployerNames().size()>0 ) { - sql_stringBuffer.append( " and o.deployerName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getDeployerNames() ); - index++; - } - if (null != wrapIn.getCreatorUnitNames() && wrapIn.getCreatorUnitNames().size()>0) { - sql_stringBuffer.append( " and o.deployerUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorUnitNames() ); - index++; - } - if (null != wrapIn.getCreatorTopUnitNames() && wrapIn.getCreatorTopUnitNames().size() > 0 ) { - sql_stringBuffer.append( " and o.deployerTopUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorTopUnitNames() ); - index++; - } - if (null != wrapIn.getWorkProcessStatusList() && wrapIn.getWorkProcessStatusList().size() > 0 ) { - sql_stringBuffer.append( " and o.workProcessStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getWorkProcessStatusList() ); - index++; - } - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%"+wrapIn.getTitle()+"%" ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0 ) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + ( StringUtils.equalsIgnoreCase( order, "DESC" ) ? "DESC" : "ASC" ) ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkBaseInfo.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询上一页的信息数据 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings( "unchecked" ) - public List listPrevWithFilter( String id, Integer count, Object sequence, WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - String order = wrapIn.getOrder();//排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - if( order == null || order.isEmpty() ){ - order = "DESC"; - } - - sql_stringBuffer.append( "SELECT o FROM " + OkrWorkBaseInfo.class.getCanonicalName()+" o where 1=1" ); - if ((null != sequence) ) { - sql_stringBuffer.append( " and o."+wrapIn.getSequenceField()+" " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? ">" : "<" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ((null != wrapIn.getWorkIds()) && wrapIn.getWorkIds().size() > 0) { - sql_stringBuffer.append( " and o.id in ( ?" + (index) + " )" ); - vs.add( wrapIn.getWorkIds() ); - index++; - } - if ((null != wrapIn.getCreatorNames()) && wrapIn.getCreatorNames().size() > 0) { - sql_stringBuffer.append( " and o.creatorName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorNames() ); - index++; - } - if (null != wrapIn.getCreatorUnitNames() && wrapIn.getCreatorUnitNames().size()>0) { - sql_stringBuffer.append( " and o.creatorUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorUnitNames() ); - index++; - } - if (null != wrapIn.getCreatorTopUnitNames() && wrapIn.getCreatorTopUnitNames().size() > 0 ) { - sql_stringBuffer.append( " and o.creatorTopUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorTopUnitNames() ); - index++; - } - if ((null != wrapIn.getDeployerNames()) && wrapIn.getDeployerNames().size()>0 ) { - sql_stringBuffer.append( " and o.deployerName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getDeployerNames() ); - index++; - } - if (null != wrapIn.getCreatorUnitNames() && wrapIn.getCreatorUnitNames().size()>0) { - sql_stringBuffer.append( " and o.deployerUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorUnitNames() ); - index++; - } - if (null != wrapIn.getCreatorTopUnitNames() && wrapIn.getCreatorTopUnitNames().size() > 0 ) { - sql_stringBuffer.append( " and o.deployerTopUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorTopUnitNames() ); - index++; - } - if (null != wrapIn.getWorkProcessStatusList() && wrapIn.getWorkProcessStatusList().size() > 0 ) { - sql_stringBuffer.append( " and o.workProcessStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getWorkProcessStatusList() ); - index++; - } - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%"+wrapIn.getTitle()+"%" ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0 ) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + ( StringUtils.equalsIgnoreCase( order, "DESC" ) ? "DESC" : "ASC" ) ); - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkBaseInfo.class ); - //为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询符合的信息总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter( WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append( "SELECT count(o.id) FROM "+OkrWorkBaseInfo.class.getCanonicalName()+" o where 1=1" ); - - if ((null != wrapIn.getWorkIds()) && wrapIn.getWorkIds().size() > 0) { - sql_stringBuffer.append( " and o.id in ( ?" + (index) + " )" ); - vs.add( wrapIn.getWorkIds() ); - index++; - } - if ((null != wrapIn.getCreatorNames()) && wrapIn.getCreatorNames().size() > 0) { - sql_stringBuffer.append( " and o.creatorName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorNames() ); - index++; - } - if (null != wrapIn.getCreatorUnitNames() && wrapIn.getCreatorUnitNames().size()>0) { - sql_stringBuffer.append( " and o.creatorUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorUnitNames() ); - index++; - } - if (null != wrapIn.getCreatorTopUnitNames() && wrapIn.getCreatorTopUnitNames().size() > 0 ) { - sql_stringBuffer.append( " and o.creatorTopUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorTopUnitNames() ); - index++; - } - if ((null != wrapIn.getDeployerNames()) && wrapIn.getDeployerNames().size()>0 ) { - sql_stringBuffer.append( " and o.deployerName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getDeployerNames() ); - index++; - } - if (null != wrapIn.getCreatorUnitNames() && wrapIn.getCreatorUnitNames().size()>0) { - sql_stringBuffer.append( " and o.deployerUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorUnitNames() ); - index++; - } - if (null != wrapIn.getCreatorTopUnitNames() && wrapIn.getCreatorTopUnitNames().size() > 0 ) { - sql_stringBuffer.append( " and o.deployerTopUnitName in ( ?" + (index) + " )" ); - vs.add( wrapIn.getCreatorTopUnitNames() ); - index++; - } - if (null != wrapIn.getWorkProcessStatusList() && wrapIn.getWorkProcessStatusList().size() > 0 ) { - sql_stringBuffer.append( " and o.workProcessStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getWorkProcessStatusList() ); - index++; - } - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%"+wrapIn.getTitle()+"%" ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0 ) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkBaseInfo.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - - //@MethodDescribe( "在IDS范围内，查询所有状态正常并且待确认的工作" ) - public List listUnConfirmWorkIdInIds(List ids ) throws Exception { - if( ids == null || ids.size() == 0 ){ - throw new Exception( "ids is null" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkBaseInfo.class); - Predicate p = root.get(OkrWorkBaseInfo_.id).in(ids); - p = cb.and( p, cb.equal( root.get(OkrWorkBaseInfo_.workProcessStatus ), "待确认" )); - p = cb.and( p, cb.equal( root.get(OkrWorkBaseInfo_.status ), "正常" )); - cq.select(root.get(OkrWorkBaseInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId( String centerId, List statuses ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< String > cq = cb.createQuery( String.class ); - Root< OkrWorkBaseInfo > root = cq.from( OkrWorkBaseInfo.class ); - Predicate p = cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId ); - if( statuses != null && statuses.size() > 0 ){ - p = cb.and( p, root.get( OkrWorkBaseInfo_.status ).in( statuses )); - } - cq.select( root.get( OkrWorkBaseInfo_.id ) ); - return em.createQuery( cq.where(p) ).getResultList(); - } - - /** - * 根据中心工作ID和有权限访问的工作ID列表来查询工作信息列表 - * @param centerId - * @param workIds - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID和有权限访问的工作ID列表来查询工作信息列表" ) - public List listWorkByCenterId( String centerId, List workIds, List statuses) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< OkrWorkBaseInfo > cq = cb.createQuery( OkrWorkBaseInfo.class ); - Root< OkrWorkBaseInfo > root = cq.from( OkrWorkBaseInfo.class ); - Predicate p = cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId ); - if( workIds != null && workIds.size() > 0 ){ - p = cb.and( p, root.get( OkrWorkBaseInfo_.id ).in( workIds )); - } - if( statuses != null && statuses.size() > 0 ){ - p = cb.and( p, root.get( OkrWorkBaseInfo_.status ).in( statuses )); - } - return em.createQuery( cq.where(p) ).getResultList(); - } - - //@MethodDescribe( "查询需要立即进行工作汇报的工作ID列表" ) - public List listNeedReportWorkIds() throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkBaseInfo.class); - cq.select( root.get( OkrWorkBaseInfo_.id ) ); - Predicate p = cb.isNotNull( root.get( OkrWorkBaseInfo_.nextReportTime) ); - //下一次汇报时间早于当前时间 - p = cb.and( p, cb.lessThanOrEqualTo(root.get( OkrWorkBaseInfo_.nextReportTime ), new Date())); - //未完成的工作 - p = cb.and( p, cb.isFalse( root.get( OkrWorkBaseInfo_.isCompleted ) )); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.status ), "正常" )); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listByParentId(String id) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( " id is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< String > cq = cb.createQuery( String.class ); - Root< OkrWorkBaseInfo > root = cq.from( OkrWorkBaseInfo.class ); - Predicate p = cb.equal( root.get( OkrWorkBaseInfo_.parentWorkId ), id ); - cq.select( root.get( OkrWorkBaseInfo_.id ) ); - return em.createQuery( cq.where(p) ).getResultList(); - } - - /** - * 根据分析时间来查询需要进行进展分析的工作ID列表 - * @param report_progress - * @param count - * @return - * @throws Exception - */ - //@MethodDescribe( "根据分析时间来查询需要进行进展分析的工作ID列表" ) - public List listIdsForNeedProgressAnalyse( String report_progress, int count ) throws Exception { - if( report_progress == null || report_progress.isEmpty() ){ - throw new Exception( "report_progress is null." ); - } - if( count == 0 ){ - throw new Exception( "count is 0." ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< String > cq = cb.createQuery( String.class ); - Root< OkrWorkBaseInfo > root = cq.from( OkrWorkBaseInfo.class ); - Predicate p = cb.isFalse( root.get( OkrWorkBaseInfo_.isCompleted ) ); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.workProcessStatus ), "执行中" ) ); - Predicate p1 = cb.isNull( root.get( OkrWorkBaseInfo_.progressAnalyseTime ) ); - p1 = cb.or( p1, cb.notEqual( root.get( OkrWorkBaseInfo_.progressAnalyseTime ), report_progress )); - p = cb.and( p, p1 ); - cq.select( root.get( OkrWorkBaseInfo_.id ) ); - return em.createQuery( cq.where(p) ).setMaxResults( count ).getResultList(); - } - - public Long getProcessingWorkCountByCenterId( String centerId, List status ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null." ); - } - if( status == null || status.isEmpty() ){ - throw new Exception( "status is null." ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrWorkBaseInfo.class); - Predicate p = root.get( OkrWorkBaseInfo_.status ).in( status ); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId)); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.workProcessStatus ), "执行中")); - //查询总数 - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getWorkTotalByCenterId( String centerId, List status ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null." ); - } - if( status == null || status.isEmpty() ){ - throw new Exception( "status is null." ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrWorkBaseInfo.class); - Predicate p = root.get( OkrWorkBaseInfo_.status ).in( status ); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId)); - //查询总数 - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getCompletedWorkCountByCenterId(String centerId, List status) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null." ); - } - if( status == null || status.isEmpty() ){ - throw new Exception( "status is null." ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrWorkBaseInfo.class); - Predicate p = root.get( OkrWorkBaseInfo_.status ).in( status ); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId)); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.workProcessStatus ), "已完成")); - //查询总数 - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getOvertimeWorkCountByCenterId(String centerId, List status) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null." ); - } - if( status == null || status.isEmpty() ){ - throw new Exception( "status is null." ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrWorkBaseInfo.class); - Predicate p = root.get( OkrWorkBaseInfo_.status ).in( status ); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId)); - p = cb.and( p, cb.isTrue( root.get( OkrWorkBaseInfo_.isOverTime ))); - //查询总数 - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getDraftWorkCountByCenterId(String centerId, List status) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null." ); - } - if( status == null || status.isEmpty() ){ - throw new Exception( "status is null." ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from( OkrWorkBaseInfo.class); - Predicate p = root.get( OkrWorkBaseInfo_.status ).in( status ); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId)); - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.workProcessStatus ), "草稿")); - //查询总数 - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public List listAllProcessingWorks() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkBaseInfo.class); - Root root = cq.from(OkrWorkBaseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkBaseInfo_.status ), "正常"); - p = cb.and( p, cb.equal( root.get(OkrWorkBaseInfo_.workProcessStatus ), "执行中" ) ); - p = cb.and( p, cb.lessThan( root.get(OkrWorkBaseInfo_.overallProgress ), 100 ) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listAllProcessingWorkIds() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkBaseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkBaseInfo_.status ), "正常"); - p = cb.and( p, cb.equal( root.get(OkrWorkBaseInfo_.workProcessStatus ), "执行中" ) ); - p = cb.and( p, cb.lessThan( root.get(OkrWorkBaseInfo_.overallProgress ), 100 ) ); - cq.select( root.get( OkrWorkBaseInfo_.id ) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listAllDeployedWorks( String centerId, String status ) throws Exception { - List processStatus = new ArrayList(); - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkBaseInfo.class); - Root root = cq.from(OkrWorkBaseInfo.class); - processStatus.add( "执行中" ); - processStatus.add( "已完成" ); - Predicate p = root.get(OkrWorkBaseInfo_.workProcessStatus ).in( processStatus ); - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrWorkBaseInfo_.status ), status ) ); - } - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get(OkrWorkBaseInfo_.centerId ), centerId ) ); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listAllDeployedWorkIds( String centerId, String status ) throws Exception { - List processStatus = new ArrayList(); - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkBaseInfo.class); - processStatus.add( "执行中" ); - processStatus.add( "已完成" ); - Predicate p = root.get( OkrWorkBaseInfo_.workProcessStatus ).in( processStatus ); - if( status != null && !"All".equals( status )) { - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.status ), status ) ); - } - if( centerId != null && !centerId.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.centerId ), centerId ) ); - } - cq.select( root.get( OkrWorkBaseInfo_.id ) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询具体工作协助者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctCooperateIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - /* - CriteriaQuery cq = cb.createQuery( List.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - cq.select(root.get( OkrWorkBaseInfo_.cooperateIdentityList )); - List allList = em.createQuery(cq).getResultList(); - */ - - CriteriaQuery cq = cb.createQuery( OkrWorkBaseInfo.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - List os = em.createQuery(cq.select(root)).getResultList(); - List allList = new ArrayList<>(); - for (OkrWorkBaseInfo o : os) { - allList.add(o.getCooperateIdentityList()); - } - - - if(ListTools.isNotEmpty( allList )) { - HashSet hashSet = new HashSet(); - for( List identities : allList ) { - if(ListTools.isNotEmpty( identities )) { - for( String identity : identities ) { - if( ListTools.isNotEmpty(identities_ok) && identities_ok.contains( identity ) ){ - continue; - } - if( ListTools.isNotEmpty(identities_error) && identities_error.contains( identity ) ){ - continue; - } - hashSet.add( identity ); - } - } - } - List result = new ArrayList<>(); - result.addAll(hashSet); - return result; - } - return null; - } - - /** - * 查询具体工作创建者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctCreatorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkBaseInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkBaseInfo_.creatorIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkBaseInfo_.creatorIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkBaseInfo_.creatorIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询具体工作部署者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctDeployerIdentity( List identities_ok, List identities_error ) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkBaseInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkBaseInfo_.deployerIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkBaseInfo_.deployerIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkBaseInfo_.deployerIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询具体工作阅知领导身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctReportLeaderIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - /* - CriteriaQuery cq = cb.createQuery( List.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - cq.select(root.get( OkrWorkBaseInfo_.readLeaderIdentityList )); - List allList = em.createQuery(cq).getResultList(); - */ - - CriteriaQuery cq = cb.createQuery( OkrWorkBaseInfo.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - List os = em.createQuery(cq.select(root)).getResultList(); - List allList = new ArrayList<>(); - for (OkrWorkBaseInfo o : os) { - allList.add(o.getReadLeaderIdentityList()); - } - - if(ListTools.isNotEmpty( allList )) { - HashSet hashSet = new HashSet(); - for( List identities : allList ) { - if(ListTools.isNotEmpty( identities )) { - for( String identity : identities ) { - if( ListTools.isNotEmpty(identities_ok) && identities_ok.contains( identity ) ){ - continue; - } - if( ListTools.isNotEmpty(identities_error) && identities_error.contains( identity ) ){ - continue; - } - hashSet.add( identity ); - } - } - } - List result = new ArrayList<>(); - result.addAll(hashSet); - return result; - } - return null; - } - /** - * 查询具体工作阅知领导身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctResponsibilityIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrWorkBaseInfo.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkBaseInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkBaseInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkBaseInfo_.responsibilityIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkBaseInfo_.responsibilityIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkBaseInfo_.responsibilityIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据身份名称，从具体工作信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkBaseInfo(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkBaseInfo.class ); - Root root = cq.from( OkrWorkBaseInfo.class ); - Predicate p = cb.isNotNull(root.get( OkrWorkBaseInfo_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrWorkBaseInfo_.id ), recordId ) ); - } - - Predicate p_creatorIdentity = cb.isNotNull(root.get( OkrWorkBaseInfo_.creatorIdentity )); - p_creatorIdentity = cb.and( p_creatorIdentity, cb.equal( root.get( OkrWorkBaseInfo_.creatorIdentity ), identity ) ); - - Predicate p_deployerIdentity = cb.isNotNull(root.get( OkrWorkBaseInfo_.deployerIdentity )); - p_deployerIdentity = cb.and( p_deployerIdentity, cb.equal( root.get( OkrWorkBaseInfo_.deployerIdentity ), identity ) ); - - Predicate p_reportAdminIdentity = cb.isNotNull(root.get( OkrWorkBaseInfo_.reportAdminIdentity )); - p_reportAdminIdentity = cb.and( p_reportAdminIdentity, cb.equal( root.get( OkrWorkBaseInfo_.reportAdminIdentity ), identity ) ); - - Predicate p_responsibilityIdentity = cb.isNotNull(root.get( OkrWorkBaseInfo_.responsibilityIdentity )); - p_responsibilityIdentity = cb.and( p_responsibilityIdentity, cb.equal( root.get( OkrWorkBaseInfo_.responsibilityIdentity ), identity ) ); - - Predicate p_cooperateIdentity = cb.isNotNull(root.get( OkrWorkBaseInfo_.cooperateIdentityList )); - p_cooperateIdentity = cb.and( p_cooperateIdentity, cb.isMember( identity, root.get( OkrWorkBaseInfo_.cooperateIdentityList )) ); - - Predicate p_readLeaderIdentity = cb.isNotNull(root.get( OkrWorkBaseInfo_.readLeaderIdentityList )); - p_readLeaderIdentity = cb.and( p_readLeaderIdentity, cb.isMember( identity, root.get( OkrWorkBaseInfo_.readLeaderIdentityList ) ) ); - - Predicate p_identity = cb.or( p_creatorIdentity, p_deployerIdentity, p_reportAdminIdentity, p_responsibilityIdentity, p_cooperateIdentity, p_readLeaderIdentity ); - - p = cb.and( p, p_identity ); - - return em.createQuery(cq.where(p)).getResultList(); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkChatFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkChatFactory.java deleted file mode 100644 index 8d5c22d745..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkChatFactory.java +++ /dev/null @@ -1,295 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkChat_; - -/** - * 类 名：OkrWorkChatFactory
- * 实体类：OkrWorkChat
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkChatFactory extends AbstractFactory { - - public OkrWorkChatFactory( Business business ) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkChat实体信息对象" ) - public OkrWorkChat get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkChat.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkChat实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkChat.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkChat.class); - cq.select(root.get(OkrWorkChat_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkChat实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkChat.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkChat.class); - Root root = cq.from(OkrWorkChat.class); - Predicate p = root.get(OkrWorkChat_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkChat.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery< String > cq = cb.createQuery( String.class ); - Root< OkrWorkChat > root = cq.from( OkrWorkChat.class ); - Predicate p = cb.equal( root.get( OkrWorkChat_.centerId ), centerId ); - cq.select( root.get( OkrWorkChat_.id ) ); - return em.createQuery( cq.where(p) ).getResultList(); - } - - /** - * 根据工作信息ID，列示所有的数据信息 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，列示所有的数据信息" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get( OkrWorkChat.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkChat.class); - Predicate p = cb.equal( root.get( OkrWorkChat_.workId ), workId ); - cq.select(root.get( OkrWorkChat_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询下一页的信息数据 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings( "unchecked" ) - public List listNextWithFilter( String id, Integer count, Object sequence, String workId, String sequenceField, String order ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkChat.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - - if( order == null || order.isEmpty() ){ - order = "DESC"; - } - - Integer index = 1; - sql_stringBuffer.append( "SELECT o FROM "+OkrWorkChat.class.getCanonicalName()+" o where 1=1" ); - - if ((null != sequence) ) { - sql_stringBuffer.append( " and o."+ sequenceField +" " + (StringUtils.equalsIgnoreCase( order, "DESC" ) ? "<" : ">" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ( null != workId && !workId.isEmpty() ) { - sql_stringBuffer.append( " and o.workId = ?" + (index) ); - vs.add( workId ); - index++; - } - - sql_stringBuffer.append( " order by o." + sequenceField + " " + ( StringUtils.equalsIgnoreCase( order, "DESC" ) ? "DESC" : "ASC" ) ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkChat.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询上一页的信息数据 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings( "unchecked" ) - public List listPrevWithFilter( String id, Integer count, Object sequence, String workId, String sequenceField, String order ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkChat.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - if( order == null || order.isEmpty() ){ - order = "DESC"; - } - - sql_stringBuffer.append( "SELECT o FROM "+ OkrWorkChat.class.getCanonicalName() +" o where 1=1" ); - - if ((null != sequence) ) { - sql_stringBuffer.append( " and o."+ sequenceField +" " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? ">" : "<" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ( null != workId && !workId.isEmpty() ) { - sql_stringBuffer.append( " and o.workId = ?" + (index) ); - vs.add( workId ); - index++; - } - - sql_stringBuffer.append( " order by o." + sequenceField + " " + ( StringUtils.equalsIgnoreCase( order, "DESC" ) ? "DESC" : "ASC" ) ); - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkChat.class ); - //为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询符合的信息总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter( String workId ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkChat.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append( "SELECT count(o.id) FROM "+OkrWorkChat.class.getCanonicalName()+" o where 1=1" ); - - if ( null != workId && !workId.isEmpty() ) { - sql_stringBuffer.append( " and o.workId = ?" + (index) ); - vs.add( workId ); - index++; - } - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkChat.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - /** - * 查询工作交流信息发送者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctSenderIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkChat.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkChat.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkChat_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkChat_.senderIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkChat_.senderIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkChat_.senderIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询工作交流信息接收者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctTargetIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkChat.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkChat.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkChat_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkChat_.targetIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkChat_.targetIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkChat_.targetIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从具体工作交流信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkChat(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkChat.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkChat.class ); - Root root = cq.from( OkrWorkChat.class ); - Predicate p = cb.isNotNull(root.get( OkrWorkChat_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrWorkChat_.id ), recordId ) ); - } - - Predicate p_targetIdentity = cb.isNotNull(root.get( OkrWorkChat_.targetIdentity )); - p_targetIdentity = cb.and( p_targetIdentity, cb.equal( root.get( OkrWorkChat_.targetIdentity ), identity ) ); - - Predicate p_senderIdentity = cb.isNotNull(root.get( OkrWorkChat_.senderIdentity )); - p_senderIdentity = cb.and( p_senderIdentity, cb.equal( root.get( OkrWorkChat_.senderIdentity ), identity ) ); - - Predicate p_identity = cb.or( p_targetIdentity, p_senderIdentity ); - - p = cb.and( p, p_identity ); - - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDetailInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDetailInfoFactory.java deleted file mode 100644 index 252eb65834..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDetailInfoFactory.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkDetailInfo; -import com.x.okr.entity.OkrWorkDetailInfo_; - -/** - * 类 名：OkrWorkDetailInfoFactory
- * 实体类：OkrWorkDetailInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkDetailInfoFactory extends AbstractFactory { - - public OkrWorkDetailInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkDetailInfo实体信息对象" ) - public OkrWorkDetailInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkDetailInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkDetailInfo实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkDetailInfo.class); - cq.select(root.get(OkrWorkDetailInfo_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkDetailInfo实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkDetailInfo.class); - Root root = cq.from(OkrWorkDetailInfo.class); - Predicate p = root.get(OkrWorkDetailInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ -// @MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkDetailInfo.class); - Predicate p = cb.equal( root.get( OkrWorkDetailInfo_.centerId ), centerId ); - cq.select(root.get( OkrWorkDetailInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listByWorkId(String workId) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( " workId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkDetailInfo.class); - Predicate p = cb.equal( root.get( OkrWorkDetailInfo_.id ), workId ); - cq.select(root.get( OkrWorkDetailInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDynamicsFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDynamicsFactory.java deleted file mode 100644 index 7023c48e3c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkDynamicsFactory.java +++ /dev/null @@ -1,349 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkDynamics_; - -/** - * 类 名：OkrWorkDynamicsFactory
- * 实体类：OkrWorkDynamics
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 - **/ -public class OkrWorkDynamicsFactory extends AbstractFactory { - - public OkrWorkDynamicsFactory(Business business) throws Exception { - super(business); - } - - // @MethodDescribe( "获取指定Id的OkrWorkDynamics实体信息对象" ) - public OkrWorkDynamics get(String id) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkDynamics.class, ExceptionWhen.none); - } - - // @MethodDescribe( "列示全部的OkrWorkDynamics实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkDynamics.class); - cq.select(root.get(OkrWorkDynamics_.id)); - return em.createQuery(cq).getResultList(); - } - - // @MethodDescribe( "列示指定Id的OkrWorkDynamics实体信息列表" ) - public List list(List ids) throws Exception { - if (ids == null || ids.size() == 0) { - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkDynamics.class); - Root root = cq.from(OkrWorkDynamics.class); - Predicate p = root.get(OkrWorkDynamics_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * - * @param centerId - * 中心工作 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception(" centerId is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkDynamics.class); - Predicate p = cb.equal(root.get(OkrWorkDynamics_.centerId), centerId); - cq.select(root.get(OkrWorkDynamics_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，列示所有的数据信息 - * - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe("根据工作信息ID，列示所有的数据信息") - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkDynamics.class); - Predicate p = cb.equal(root.get(OkrWorkDynamics_.workId), workId); - cq.select(root.get(OkrWorkDynamics_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询下一页的信息数据 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List listNextWithFilter(String id, Integer count, Object sequence, List centerIds, - List workIds, String sequenceField, String order, Boolean isOkrManager) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - - if (order == null || order.isEmpty()) { - order = "DESC"; - } - - Integer index = 1; - sql_stringBuffer.append("SELECT o FROM " + OkrWorkDynamics.class.getCanonicalName() + " o where 1=1"); - - if ((null != sequence)) { - sql_stringBuffer.append(" and o." + sequenceField + " " - + (StringUtils.equalsIgnoreCase(order, "DESC") ? "<" : ">") + (" ?" + (index))); - vs.add(sequence); - index++; - } - - if ((null != centerIds && centerIds.size() > 0) || (null != workIds && workIds.size() > 0)) { - sql_stringBuffer.append(" and ( "); - // 中心工作IDS - if (null != centerIds && centerIds.size() > 0) { - sql_stringBuffer.append(" o.centerId in ( ?" + (index) + " )"); - vs.add(centerIds); - index++; - } - - if (null != centerIds && centerIds.size() > 0 && null != workIds && workIds.size() > 0) { - sql_stringBuffer.append(" or "); - } - - // 工作IDS - if (null != workIds && workIds.size() > 0) { - sql_stringBuffer.append(" o.workId in ( ?" + (index) + " )"); - vs.add(workIds); - index++; - } - - sql_stringBuffer.append(" ) "); - } else { - if (!isOkrManager) { - return null; - } - } - - sql_stringBuffer.append( - " order by o." + sequenceField + " " + (StringUtils.equalsIgnoreCase(order, "DESC") ? "DESC" : "ASC")); - - Query query = em.createQuery(sql_stringBuffer.toString(), OkrWorkDynamics.class); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询上一页的信息数据 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List listPrevWithFilter(String id, Integer count, Object sequence, List centerIds, - List workIds, String sequenceField, String order, Boolean isOkrSystemAdmin) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - if (order == null || order.isEmpty()) { - order = "DESC"; - } - - sql_stringBuffer.append("SELECT o FROM " + OkrWorkDynamics.class.getCanonicalName() + " o where 1=1"); - - if ((null != sequence)) { - sql_stringBuffer.append(" and o." + sequenceField + " " - + (StringUtils.equalsIgnoreCase(order, "DESC") ? "<" : ">") + (" ?" + (index))); - vs.add(sequence); - index++; - } - - if ((null != centerIds && centerIds.size() > 0) || (null != workIds && workIds.size() > 0)) { - sql_stringBuffer.append(" and ( "); - // 中心工作IDS - if (null != centerIds && centerIds.size() > 0) { - sql_stringBuffer.append(" o.centerId in ( ?" + (index) + " )"); - vs.add(centerIds); - index++; - } - - if (null != centerIds && centerIds.size() > 0 && null != workIds && workIds.size() > 0) { - sql_stringBuffer.append(" or "); - } - - // 工作IDS - if (null != workIds && workIds.size() > 0) { - sql_stringBuffer.append(" o.workId in ( ?" + (index) + " )"); - vs.add(workIds); - index++; - } - - sql_stringBuffer.append(" ) "); - } else { - if (!isOkrSystemAdmin) { - return null; - } - } - - sql_stringBuffer.append( - " order by o." + sequenceField + " " + (StringUtils.equalsIgnoreCase(order, "DESC") ? "DESC" : "ASC")); - - Query query = em.createQuery(sql_stringBuffer.toString(), OkrWorkDynamics.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询符合的信息总数 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter(List centerIds, List workIds, String sequenceField, String order, - Boolean isOkrSystemAdmin) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append("SELECT count(o.id) FROM " + OkrWorkDynamics.class.getCanonicalName() + " o where 1=1"); - - if ((null != centerIds && centerIds.size() > 0) || (null != workIds && workIds.size() > 0)) { - sql_stringBuffer.append(" and ( "); - // 中心工作IDS - if (null != centerIds && centerIds.size() > 0) { - sql_stringBuffer.append(" o.centerId in ( ?" + (index) + " )"); - vs.add(centerIds); - index++; - } - - if (null != centerIds && centerIds.size() > 0 && null != workIds && workIds.size() > 0) { - sql_stringBuffer.append(" or "); - } - - // 工作IDS - if (null != workIds && workIds.size() > 0) { - sql_stringBuffer.append(" o.workId in ( ?" + (index) + " )"); - vs.add(workIds); - index++; - } - - sql_stringBuffer.append(" ) "); - } else { - if (!isOkrSystemAdmin) { - return 0; - } - } - - Query query = em.createQuery(sql_stringBuffer.toString(), OkrWorkDynamics.class); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - - /** - * 查询工作动态信息操作者身份列表（去重复） - * - * @param identities_ok - * 排除身份 - * @param identities_error - * 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctTargetIdentity(List identities_ok, List identities_error) - throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkDynamics.class); - - Predicate p = cb.isNotNull(root.get(OkrWorkDynamics_.id)); - if (identities_ok != null && identities_ok.size() > 0) { - p = cb.and(p, cb.not(root.get(OkrWorkDynamics_.targetIdentity).in(identities_ok))); - } - if (identities_error != null && identities_error.size() > 0) { - p = cb.and(p, cb.not(root.get(OkrWorkDynamics_.targetIdentity).in(identities_error))); - } - cq.select(root.get(OkrWorkDynamics_.targetIdentity)); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据身份名称，从具体工作操作动态信息中查询与该身份有关的所有信息列表 - * - * @param identity - * @return - * @throws Exception - */ - public List listErrorIdentitiesInDynamics(String identity) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkDynamics.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkDynamics.class); - Root root = cq.from(OkrWorkDynamics.class); - Predicate p = cb.isNotNull(root.get(OkrWorkDynamics_.id)); - - Predicate p_targetIdentity = cb.isNotNull(root.get(OkrWorkDynamics_.targetIdentity)); - p_targetIdentity = cb.and(p_targetIdentity, cb.equal(root.get(OkrWorkDynamics_.targetIdentity), identity)); - - p = cb.and(p, p_targetIdentity); - - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonFactory.java deleted file mode 100644 index af14534cf7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonFactory.java +++ /dev/null @@ -1,1432 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkPerson_; - -public class OkrWorkPersonFactory extends AbstractFactory { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkPersonFactory.class); - - public OkrWorkPersonFactory(Business business) throws Exception { - super(business); - } - - // @MethodDescribe( "获取指定Id的OkrWorkPerson对象" ) - public OkrWorkPerson get(String id) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkPerson.class, ExceptionWhen.none); - } - - // @MethodDescribe( "列示全部的OkrWorkPerson列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq).getResultList(); - } - - // @MethodDescribe( "列示指定Id的OkrWorkPerson列表" ) - public List list(List ids) throws Exception { - if (ids == null || ids.size() == 0) { - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkPerson.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据用户姓名，列示有权限访问的所有具体工作Id列表 - * - * @param name - * @param statuses - * 需要显示的信息状态: 正常|已删除 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据用户姓名，列示有权限访问的所有具体工作Id列表" ) - public List listDistinctWorkIdsByIdentity(String userIdentity, String centerId, List statuses) - throws Exception { - if (userIdentity == null || userIdentity.isEmpty()) { - logger.warn("userIdentity is null!"); - return null; - } - - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.workId)); - - /** - * 获取的时候过滤条件： 1、如果当前身份是创建者或者部署者的，那么，草稿也要取，如果当前身份不是创建者或者部署者，那么草稿不要去 - * 2、信息状态是正常的才取出来 3、观察者是自己的取出来 状态正常 and ( ( 姓名 = name and 身份 in ( 部署者, - * 创建者 ) ) or ( 姓名 = name and 身份 in ( 协助者，阅知者 ) and 处理状态 != 草稿 ) ) - */ - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.workId)); // 工作ID不为空的就是具体工作的权限信息 - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - - List identityList_1 = new ArrayList(); - List identityList_2 = new ArrayList(); - identityList_1.add("部署者"); - identityList_1.add("创建者"); - // ( 姓名 = name and 身份 in ( 部署者, 创建者 ) ) - Predicate p_creator_or_depoloyer = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), userIdentity); - p_creator_or_depoloyer = cb.and(p_creator_or_depoloyer, - root.get(OkrWorkPerson_.processIdentity).in(identityList_1)); - - identityList_2.add("观察者"); - identityList_2.add("协助者"); - identityList_2.add("责任者"); - identityList_2.add("阅知者"); - identityList_2.add("授权者"); - // ( 姓名 = name and 身份 in ( 责任者，协助者，阅知者 ) and 处理状态 != 草稿 ) - Predicate p_watcher = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), userIdentity); - p_watcher = cb.and(p_watcher, root.get(OkrWorkPerson_.processIdentity).in(identityList_2)); - p_watcher = cb.and(p_watcher, cb.notEqual(root.get(OkrWorkPerson_.workProcessStatus), "草稿")); - - p = cb.and(p, cb.or(p_creator_or_depoloyer, p_watcher)); - - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据用户姓名，列示有权限访问的所有具体工作Id列表 - * - * @param name - * @param statuses - * 需要显示的信息状态: 正常|已删除 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据用户姓名，列示有权限访问的所有具体工作Id列表" ) - public List listDistinctWorkIdsWithMe(String userIdentity, String centerId) throws Exception { - if (userIdentity == null || userIdentity.isEmpty()) { - logger.warn("userIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.workId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), userIdentity); - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据用户姓名和处理者身份，列示有权限访问的所有具体工作Id列表" ) - public List listDistinctWorkIdsByPerson(String name, String processIdentity) throws Exception { - if (name == null || name.isEmpty()) { - logger.warn("name is null!"); - return null; - } - if (processIdentity == null || processIdentity.isEmpty()) { - logger.warn("processIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.workId)); - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.workId)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeName), name)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据用户姓名和处理者身份，列示有权限访问的所有具体工作Id列表" ) - public List listDistinctWorkIdsByPersonIndentity(String centerId, String identity, String processIdentity, - List notInCenterIds) throws Exception { - if (identity == null || identity.isEmpty()) { - logger.warn("identity is null!"); - return null; - } - if (processIdentity == null || processIdentity.isEmpty()) { - logger.warn("processIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.workId)); - - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.workId)); - - if (notInCenterIds != null && !notInCenterIds.isEmpty()) { - p = cb.and(p, cb.not(root.get(OkrWorkPerson_.centerId).in(notInCenterIds))); - } - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.status), "正常")); - - return em.createQuery(cq.where(p)).setMaxResults(200).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据用户姓名，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByPerson(String name, List statuses) throws Exception { - if (name == null || name.isEmpty()) { - logger.warn("name is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeName), name); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据用户姓名和处理者身份，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByPerson(String name, String processIdentity, List statuses) - throws Exception { - if (name == null || name.isEmpty()) { - logger.warn("name is null!"); - return null; - } - if (processIdentity == null || processIdentity.isEmpty()) { - logger.warn("processIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeName), name); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据用户身份和处理者身份，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByPersonIdentity(String identity, String processIdentity, - List statuses) throws Exception { - if (identity == null || identity.isEmpty()) { - logger.warn("identity is null!"); - return null; - } - if (processIdentity == null || processIdentity.isEmpty()) { - logger.warn("processIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据组织名称，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByUnitName(String name, List statuses) throws Exception { - if (name == null || name.isEmpty()) { - logger.warn("name is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.unitName), name); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据组织列表，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByUnitNames(List names, List statuses) throws Exception { - if (names == null || names.size() == 0) { - logger.warn("names is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = root.get(OkrWorkPerson_.unitName).in(names); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据顶层组织名称，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByTopUnitName(String name, List statuses) throws Exception { - if (name == null || name.isEmpty()) { - logger.warn("name is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.topUnitName), name); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据中心工作ID，查询所有的干系人姓名 - * - * @param centerId - * @param identity - * 干系人身份 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据中心工作ID，查询所有的干系人身份" ) - public List listDistinctIdentityNameByCenterId(String centerId, String identity) throws Exception { - if (centerId == null || centerId.isEmpty()) { - logger.warn("centerId is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.employeeIdentity)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.centerId), centerId); - if (identity != null && !identity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), identity)); - } - return em.createQuery(cq.where(p)).setMaxResults(2000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - // @MethodDescribe( "根据顶层组织列表，列示有权限访问的所有中心工作Id列表" ) - public List listDistinctCenterIdsByTopUnitNames(List names, List statuses) - throws Exception { - if (names == null || names.size() == 0) { - logger.warn("names is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.centerId)); - Predicate p = root.get(OkrWorkPerson_.topUnitName).in(names); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据工作ID，获取工作的指定干系人 - * - * @param id - * @param identity - * @return - * @throws Exception - */ - public List getWorkPerson(String workId, String identity, List statuses) throws Exception { - if (workId == null || workId.isEmpty()) { - logger.warn("id is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.employeeName)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.workId), workId); - if (identity != null && !identity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), identity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(100).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据中心工作ID，工作ID和员工姓名来查询已经存在的工作干系人信息 - * - * @param centerId - * @param workId - * @param employeeName - * @return - * @throws Exception - */ - public List listWorkByCenterAndIdentity(String centerId, String employeeIdentity, String identity, - List statuses) throws Exception { - if (employeeIdentity == null || employeeIdentity.isEmpty()) { - logger.warn("employeeIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.id)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), employeeIdentity); - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - p = cb.and(p, cb.isNotNull(root.get(OkrWorkPerson_.workId))); - if (identity != null && !identity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), identity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，工作ID和员工姓名来查询已经存在的工作干系人信息 - * - * @param centerId - * @param workId - * @param employeeName - * @return - * @throws Exception - */ - public List listByWorkAndIdentity(String centerId, String workId, String employeeIdentity, String identity, - List statuses) throws Exception { - if (employeeIdentity == null || employeeIdentity.isEmpty()) { - logger.warn("employeeIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.id)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), employeeIdentity); - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - if (workId != null && !workId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workId), workId)); - } - if (identity != null && !identity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), identity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，工作ID和员工姓名来查询已经存在的工作干系人信息 - * - * @param centerId - * @param workId - * @param employeeName - * @return - * @throws Exception - */ - public List listDistinctWorkIdsByWorkAndIdentity(String centerId, String workId, String employeeIdentity, - String identity, List statuses) throws Exception { - if (employeeIdentity == null || employeeIdentity.isEmpty()) { - logger.warn("employeeIdentity is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.workId)); - Predicate p = cb.equal(root.get(OkrWorkPerson_.employeeIdentity), employeeIdentity); - p = cb.and(p, cb.isNotNull(root.get(OkrWorkPerson_.workId))); - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - if (workId != null && !workId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workId), workId)); - } - if (identity != null && !identity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), identity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据中心工作ID，工作ID来查询已经存在的工作干系人身份 - * - * @param centerId - * @param workId - * @param employeeName - * @return - * @throws Exception - */ - public List listUserIndentityByWorkId(String centerId, String workId, String processIdentity, - List statuses) throws Exception { - if (centerId == null || centerId.isEmpty()) { - logger.warn("centerId is null!"); - return null; - } - if (workId == null || workId.isEmpty()) { - logger.warn("workId is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.employeeIdentity)); - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.employeeIdentity)); - if (centerId != null && !centerId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), centerId)); - } - if (workId != null && !workId.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workId), workId)); - } - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，获取工作干系人信息ID列表 - * - * @param workId - * @return - * @throws Exception - */ - // @MethodDescribe( "根据工作信息ID，获取工作干系人信息ID列表" ) - public List listByWorkId(String workId, List statuses) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.workId), workId); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，和处理身份, 获取工作干系人信息ID列表 - * - * @param workId - * @return - * @throws Exception - */ - // @MethodDescribe( "根据工作信息ID，和处理身份, 获取工作干系人信息ID列表" ) - public List listByWorkIdAndProcessIdentity(String workId, String processIdentity, List statuses) - throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.workId), workId); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，获取工作干系人信息ID列表 - * - * @param workId - * @return - * @throws Exception - */ - // @MethodDescribe( "根据工作信息ID，用户身份，获取工作干系人信息ID列表" ) - public List listByWorkIdAndUserIdentity(String workId, String userIdentity, List statuses) - throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.workId), workId); - if (userIdentity != null && !userIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), userIdentity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - // @MethodDescribe( "查询中心工作ID和处理人查询与其有关的所有工作ID" ) - public List listByCenterAndPerson(String centerId, String userIdentity, String processIdentity, - List statuses) throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception("center is null"); - } - if (userIdentity == null || userIdentity.isEmpty()) { - throw new Exception("userIdentity is null"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.centerId), centerId); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), userIdentity)); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，获取该中心工作信息（不包括下级工作信息）所有的干系人信息 - * - * @param centerId - * 中心工作ID - * @param processIdentity - * 干系人身份，可以为空 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据中心工作ID，获取该中心工作信息（不包括下级工作信息）所有的干系人信息" ) - public List listIdsForCenterWorkByCenterId(String centerId, String employeeIdentity, String processIdentity, - List statuses) throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception("center is null"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.centerId), centerId); - p = cb.and(p, cb.or(cb.isNull(root.get(OkrWorkPerson_.workId)), cb.equal(root.get(OkrWorkPerson_.workId), ""))); - if (employeeIdentity != null && !employeeIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), employeeIdentity)); - } - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，获取该中心工作信息（不包括下级工作信息）所有的干系人身份 - * - * @param centerId - * 中心工作ID - * @param processIdentity - * 干系人身份，可以为空 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据中心工作ID，获取该中心工作信息（不包括下级工作信息）所有的干系人信息" ) - public List listUserIdentityForCenterWork(String centerId, String processIdentity, List statuses) - throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception("center is null"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.centerId), centerId); - p = cb.and(p, cb.or(cb.isNull(root.get(OkrWorkPerson_.workId)), cb.equal(root.get(OkrWorkPerson_.workId), ""))); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.employeeIdentity)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * - * @param centerId - * 中心工作 - * @return - * @throws Exception - */ - // @MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId, List statuses) throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception(" centerId is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.centerId), centerId); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - cq.select(root.get(OkrWorkPerson_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - @SuppressWarnings("unchecked") - public List listNextWithFilter(String id, Integer count, Object sequence, - WorkCommonSearchFilter wrapIn) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - String order = wrapIn.getOrder(); // 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - if (order == null || order.isEmpty()) { - order = "DESC"; - } - sql_stringBuffer.append("SELECT o FROM " + OkrWorkPerson.class.getCanonicalName() + " o where 1=1"); - if ((null != sequence)) { - sql_stringBuffer.append(" and o." + wrapIn.getSequenceField() + " " - + (StringUtils.equalsIgnoreCase(order, "DESC") ? "<" : ">") + (" ?" + (index))); - vs.add(sequence); - index++; - } - // 对象类别，是中心工作，还是普通工作，如果是中心工作，那么普通的工作ID应该是为空的 - if (null != wrapIn.getInfoType() && "CENTERWORK".equals(wrapIn.getInfoType())) { - sql_stringBuffer.append(" and o.recordType = '中心工作' "); - if (null != wrapIn.getWorkTitle() && !wrapIn.getWorkTitle().isEmpty()) { - sql_stringBuffer.append(" and o.centerTitle like ?" + (index)); - vs.add("%" + wrapIn.getWorkTitle() + "%"); - index++; - } - } else { - sql_stringBuffer.append(" and o.recordType = '具体工作' "); - if (null != wrapIn.getWorkTitle() && !wrapIn.getWorkTitle().isEmpty()) { - sql_stringBuffer.append(" and o.workTitle like ?" + (index)); - vs.add("%" + wrapIn.getWorkTitle() + "%"); - index++; - } - } - // 干系人姓名列表 - if ((null != wrapIn.getEmployeeNames()) && wrapIn.getEmployeeNames().size() > 0) { - sql_stringBuffer.append(" and o.employeeName in ( ?" + (index) + " )"); - vs.add(wrapIn.getEmployeeNames()); - index++; - } - // 干系人姓名列表 - if ((null != wrapIn.getEmployeeIdentities()) && wrapIn.getEmployeeIdentities().size() > 0) { - sql_stringBuffer.append(" and o.employeeIdentity in ( ?" + (index) + " )"); - vs.add(wrapIn.getEmployeeIdentities()); - index++; - } - // 处理身份 - if (null != wrapIn.getProcessIdentities() && wrapIn.getProcessIdentities().size() > 0) { - sql_stringBuffer.append(" and o.processIdentity in ( ?" + (index) + " )"); - vs.add(wrapIn.getProcessIdentities()); - index++; - } - // 干系人所属组织名称列表 - if (null != wrapIn.getUnitNames() && wrapIn.getUnitNames().size() > 0) { - sql_stringBuffer.append(" and o.unitName in ( ?" + (index) + " )"); - vs.add(wrapIn.getUnitNames()); - index++; - } - // 干系人所属顶层组织名称列表 - if ((null != wrapIn.getTopUnitNames()) && wrapIn.getTopUnitNames().size() > 0) { - sql_stringBuffer.append(" and o.topUnitName in ( ?" + (index) + " )"); - vs.add(wrapIn.getTopUnitNames()); - index++; - } - // 工作类别 - if (null != wrapIn.getWorkTypes() && wrapIn.getWorkTypes().size() > 0) { - sql_stringBuffer.append(" and o.workType in ( ?" + (index) + " )"); - vs.add(wrapIn.getWorkTypes()); - index++; - } - // 部署年份 - if (null != wrapIn.getDeployYear() && !wrapIn.getDeployYear().isEmpty()) { - sql_stringBuffer.append(" and o.deployYear = ?" + (index)); - vs.add(wrapIn.getDeployYear()); - index++; - } - // 部署月份 - if (null != wrapIn.getDeployMonth() && !wrapIn.getDeployMonth().isEmpty()) { - sql_stringBuffer.append(" and o.deployMonth = ?" + (index)); - vs.add(wrapIn.getDeployMonth()); - index++; - } - // 工作时长类型：短期工作|长期工作 - if (null != wrapIn.getWorkDateTimeType() && wrapIn.getWorkDateTimeType().isEmpty()) { - sql_stringBuffer.append(" and o.workDateTimeType = ?" + (index)); - vs.add(wrapIn.getWorkDateTimeType()); - index++; - } - // 工作处理状态 - if (null != wrapIn.getWorkProcessStatuses() && wrapIn.getWorkProcessStatuses().size() > 0) { - sql_stringBuffer.append(" and o.workProcessStatus in ( ?" + (index) + " )"); - vs.add(wrapIn.getWorkProcessStatuses()); - index++; - } - if (null != wrapIn.getInfoStatuses() && wrapIn.getInfoStatuses().size() > 0) { - sql_stringBuffer.append(" and o.status in ( ?" + (index) + " )"); - vs.add(wrapIn.getInfoStatuses()); - index++; - } - sql_stringBuffer.append(" order by o." + wrapIn.getSequenceField() + " " - + (StringUtils.equalsIgnoreCase(order, "DESC") ? "DESC" : "ASC")); - - Query query = em.createQuery(sql_stringBuffer.toString(), OkrWorkPerson.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - @SuppressWarnings("unchecked") - public List listPrevWithFilter(String id, Integer count, Object sequence, - WorkCommonSearchFilter wrapIn) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - String order = wrapIn.getOrder(); // 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - if (order == null || order.isEmpty()) { - order = "DESC"; - } - sql_stringBuffer.append("SELECT o FROM " + OkrWorkPerson.class.getCanonicalName() + " o where 1=1"); - if ((null != sequence)) { - sql_stringBuffer.append(" and o." + wrapIn.getSequenceField() + " " - + (StringUtils.equalsIgnoreCase(order, "DESC") ? ">" : "<") + (" ?" + (index))); - vs.add(sequence); - index++; - } - // 对象类别，是中心工作，还是普通工作，如果是中心工作，那么普通的工作ID应该是为空的 - if (null != wrapIn.getInfoType() && "CENTERWORK".equals(wrapIn.getInfoType())) { - sql_stringBuffer.append(" and o.recordType = '中心工作' "); - if (null != wrapIn.getWorkTitle() && !wrapIn.getWorkTitle().isEmpty()) { - sql_stringBuffer.append(" and o.centerTitle like ?" + (index)); - vs.add("%" + wrapIn.getWorkTitle() + "%"); - index++; - } - } else { - sql_stringBuffer.append(" and o.recordType = '具体工作' "); - if (null != wrapIn.getWorkTitle() && !wrapIn.getWorkTitle().isEmpty()) { - sql_stringBuffer.append(" and o.workTitle like ?" + (index)); - vs.add("%" + wrapIn.getWorkTitle() + "%"); - index++; - } - } - // 干系人姓名列表 - if ((null != wrapIn.getEmployeeNames()) && wrapIn.getEmployeeNames().size() > 0) { - sql_stringBuffer.append(" and o.employeeName in ( ?" + (index) + " )"); - vs.add(wrapIn.getEmployeeNames()); - index++; - } - // 干系人姓名列表 - if ((null != wrapIn.getEmployeeIdentities()) && wrapIn.getEmployeeIdentities().size() > 0) { - sql_stringBuffer.append(" and o.employeeIdentity in ( ?" + (index) + " )"); - vs.add(wrapIn.getEmployeeIdentities()); - index++; - } - // 处理身份 - if (null != wrapIn.getProcessIdentities() && wrapIn.getProcessIdentities().size() > 0) { - sql_stringBuffer.append(" and o.processIdentity in ( ?" + (index) + " )"); - vs.add(wrapIn.getProcessIdentities()); - index++; - } - // 干系人所属组织名称列表 - if (null != wrapIn.getUnitNames() && wrapIn.getUnitNames().size() > 0) { - sql_stringBuffer.append(" and o.unitName in ( ?" + (index) + " )"); - vs.add(wrapIn.getUnitNames()); - index++; - } - // 干系人所属顶层组织名称列表 - if ((null != wrapIn.getTopUnitNames()) && wrapIn.getTopUnitNames().size() > 0) { - sql_stringBuffer.append(" and o.topUnitName in ( ?" + (index) + " )"); - vs.add(wrapIn.getTopUnitNames()); - index++; - } - // 工作类别 - if (null != wrapIn.getWorkTypes() && wrapIn.getWorkTypes().size() > 0) { - sql_stringBuffer.append(" and o.workType in ( ?" + (index) + " )"); - vs.add(wrapIn.getWorkTypes()); - index++; - } - // 部署年份 - if (null != wrapIn.getDeployYear() && !wrapIn.getDeployYear().isEmpty()) { - sql_stringBuffer.append(" and o.deployYear = ?" + (index)); - vs.add(wrapIn.getDeployYear()); - index++; - } - // 部署月份 - if (null != wrapIn.getDeployMonth() && !wrapIn.getDeployMonth().isEmpty()) { - sql_stringBuffer.append(" and o.deployMonth = ?" + (index)); - vs.add(wrapIn.getDeployMonth()); - index++; - } - // 工作时长类型：短期工作|长期工作 - if (null != wrapIn.getWorkDateTimeType() && wrapIn.getWorkDateTimeType().isEmpty()) { - sql_stringBuffer.append(" and o.workDateTimeType = ?" + (index)); - vs.add(wrapIn.getWorkDateTimeType()); - index++; - } - // 工作处理状态 - if (null != wrapIn.getWorkProcessStatuses() && wrapIn.getWorkProcessStatuses().size() > 0) { - sql_stringBuffer.append(" and o.workProcessStatus in ( ?" + (index) + " )"); - vs.add(wrapIn.getWorkProcessStatuses()); - index++; - } - if (null != wrapIn.getInfoStatuses() && wrapIn.getInfoStatuses().size() > 0) { - sql_stringBuffer.append(" and o.status in ( ?" + (index) + " )"); - vs.add(wrapIn.getInfoStatuses()); - index++; - } - sql_stringBuffer.append(" order by o." + wrapIn.getSequenceField() + " " - + (StringUtils.equalsIgnoreCase(order, "DESC") ? "DESC" : "ASC")); - Query query = em.createQuery(sql_stringBuffer.toString(), OkrWorkPerson.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询符合的信息总数 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter(WorkCommonSearchFilter wrapIn) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append("SELECT count(o.id) FROM " + OkrWorkPerson.class.getCanonicalName() + " o where 1=1"); - - // 对象类别，是中心工作，还是普通工作，如果是中心工作，那么普通的工作ID应该是为空的 - if (null != wrapIn.getInfoType() && "CENTERWORK".equals(wrapIn.getInfoType())) { - sql_stringBuffer.append(" and o.recordType = '中心工作' "); - if (null != wrapIn.getWorkTitle() && !wrapIn.getWorkTitle().isEmpty()) { - sql_stringBuffer.append(" and o.centerTitle like ?" + (index)); - vs.add("%" + wrapIn.getWorkTitle() + "%"); - index++; - } - } else { - sql_stringBuffer.append(" and o.recordType = '具体工作' "); - if (null != wrapIn.getWorkTitle() && !wrapIn.getWorkTitle().isEmpty()) { - sql_stringBuffer.append(" and o.workTitle like ?" + (index)); - vs.add("%" + wrapIn.getWorkTitle() + "%"); - index++; - } - } - // 干系人姓名列表 - if ((null != wrapIn.getEmployeeNames()) && wrapIn.getEmployeeNames().size() > 0) { - sql_stringBuffer.append(" and o.employeeName in ( ?" + (index) + " )"); - vs.add(wrapIn.getEmployeeNames()); - index++; - } - // 干系人姓名列表 - if ((null != wrapIn.getEmployeeIdentities()) && wrapIn.getEmployeeIdentities().size() > 0) { - sql_stringBuffer.append(" and o.employeeIdentity in ( ?" + (index) + " )"); - vs.add(wrapIn.getEmployeeIdentities()); - index++; - } - // 处理身份 - if (null != wrapIn.getProcessIdentities() && wrapIn.getProcessIdentities().size() > 0) { - sql_stringBuffer.append(" and o.processIdentity in ( ?" + (index) + " )"); - vs.add(wrapIn.getProcessIdentities()); - index++; - } - // 干系人所属组织名称列表 - if (null != wrapIn.getUnitNames() && wrapIn.getUnitNames().size() > 0) { - sql_stringBuffer.append(" and o.unitName in ( ?" + (index) + " )"); - vs.add(wrapIn.getUnitNames()); - index++; - } - // 干系人所属顶层组织名称列表 - if ((null != wrapIn.getTopUnitNames()) && wrapIn.getTopUnitNames().size() > 0) { - sql_stringBuffer.append(" and o.topUnitName in ( ?" + (index) + " )"); - vs.add(wrapIn.getTopUnitNames()); - index++; - } - // 工作类别 - if (null != wrapIn.getWorkTypes() && wrapIn.getWorkTypes().size() > 0) { - sql_stringBuffer.append(" and o.workType in ( ?" + (index) + " )"); - vs.add(wrapIn.getWorkTypes()); - index++; - } - // 部署年份 - if (null != wrapIn.getDeployYear() && !wrapIn.getDeployYear().isEmpty()) { - sql_stringBuffer.append(" and o.deployYear = ?" + (index)); - vs.add(wrapIn.getDeployYear()); - index++; - } - // 部署月份 - if (null != wrapIn.getDeployMonth() && !wrapIn.getDeployMonth().isEmpty()) { - sql_stringBuffer.append(" and o.deployMonth = ?" + (index)); - vs.add(wrapIn.getDeployMonth()); - index++; - } - // 工作时长类型：短期工作|长期工作 - if (null != wrapIn.getWorkDateTimeType() && wrapIn.getWorkDateTimeType().isEmpty()) { - sql_stringBuffer.append(" and o.workDateTimeType = ?" + (index)); - vs.add(wrapIn.getWorkDateTimeType()); - index++; - } - // 工作处理状态 - if (null != wrapIn.getWorkProcessStatuses() && wrapIn.getWorkProcessStatuses().size() > 0) { - sql_stringBuffer.append(" and o.workProcessStatus in ( ?" + (index) + " )"); - vs.add(wrapIn.getWorkProcessStatuses()); - index++; - } - if (null != wrapIn.getInfoStatuses() && wrapIn.getInfoStatuses().size() > 0) { - sql_stringBuffer.append(" and o.status in ( ?" + (index) + " )"); - vs.add(wrapIn.getInfoStatuses()); - index++; - } - Query query = em.createQuery(sql_stringBuffer.toString(), OkrWorkPerson.class); - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - - public List listDistinctIdentity() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.employeeIdentity)); - return em.createQuery(cq).setMaxResults(10000).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据工作类别和登录身份来查询用户可以访问到的所有中心工作数量 - * @param workTypeNames - * @param loginIdentity - * @param processIdentity - * @return - * @throws Exception - */ - public List listCenterWorkIdsByWorkType(List workTypeNames, String loginIdentity, - String processIdentity) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.id)); - if (workTypeNames != null && !workTypeNames.isEmpty()) { - p = cb.and(p, root.get(OkrWorkPerson_.workType).in(workTypeNames)); - } - if (loginIdentity != null && !loginIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), loginIdentity)); - } - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - cq.select(root.get(OkrWorkPerson_.centerId)); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - public List listByAuthorizeRecordIds(List authorizeRecordIds, List statuses) - throws Exception { - if (authorizeRecordIds == null || authorizeRecordIds.isEmpty()) { - logger.warn("authorizeRecordIds is null!"); - return null; - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - cq.select(root.get(OkrWorkPerson_.id)); - - Predicate p = root.get(OkrWorkPerson_.authorizeRecordId).in(authorizeRecordIds); - if (statuses != null && statuses.size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(statuses)); - } - return em.createQuery(cq.where(p)).setMaxResults(1000).getResultList(); - } - - public Long getProcessingWorkCountByCenterId(String identity, List status, String processIdentity) - throws Exception { - if (identity == null || identity.isEmpty()) { - throw new Exception("identity is null."); - } - if (status == null || status.isEmpty()) { - throw new Exception("status is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.status).in(status); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workProcessStatus), "执行中")); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - // 查询总数 - cq.select(cb.count(root)); - // logger.info( ">>>>getProcessingWorkCountByCenterId-SQL:" + - // em.createQuery(cq.where(p)).toString() ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getWorkTotalByCenterId(String identity, List status, String processIdentity) throws Exception { - if (identity == null || identity.isEmpty()) { - throw new Exception("identity is null."); - } - if (status == null || status.isEmpty()) { - throw new Exception("status is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.status).in(status); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - // 查询总数 - cq.select(cb.count(root)); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getCompletedWorkCountByCenterId(String identity, List status, String processIdentity) - throws Exception { - if (identity == null || identity.isEmpty()) { - throw new Exception("identity is null."); - } - if (status == null || status.isEmpty()) { - throw new Exception("status is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.status).in(status); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workProcessStatus), "已完成")); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - // 查询总数 - cq.select(cb.count(root)); - // logger.info( ">>>>getCompletedWorkCountByCenterId-SQL:" + - // em.createQuery(cq.where(p)).toString() ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getOvertimeWorkCountByCenterId(String identity, List status, String processIdentity) - throws Exception { - if (identity == null || identity.isEmpty()) { - throw new Exception("identity is null."); - } - if (status == null || status.isEmpty()) { - throw new Exception("status is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.status).in(status); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - p = cb.and(p, cb.isTrue(root.get(OkrWorkPerson_.isOverTime))); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - // 查询总数 - cq.select(cb.count(root)); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getOvertimenessWorkCountByCenterId(String identity, List status, String processIdentity) - throws Exception { - if (identity == null || identity.isEmpty()) { - throw new Exception("identity is null."); - } - if (status == null || status.isEmpty()) { - throw new Exception("status is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.status).in(status); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - p = cb.and(p, cb.isFalse(root.get(OkrWorkPerson_.isOverTime))); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - // 查询总数 - cq.select(cb.count(root)); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public Long getDraftWorkCountByCenterId(String identity, List status, String processIdentity) - throws Exception { - if (identity == null || identity.isEmpty()) { - throw new Exception("identity is null."); - } - if (status == null || status.isEmpty()) { - throw new Exception("status is null."); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = root.get(OkrWorkPerson_.status).in(status); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workProcessStatus), "草稿")); - if (processIdentity != null && !processIdentity.isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.processIdentity), processIdentity)); - } - // 查询总数 - cq.select(cb.count(root)); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - public List listCenterWorkPerson(String id, WorkCommonSearchFilter wrapIn) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkPerson.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.recordType), "中心工作"); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.centerId), id)); - // 干系人姓名列表 - if (null != wrapIn.getEmployeeNames() && wrapIn.getEmployeeNames().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.employeeName).in(wrapIn.getEmployeeNames())); - } - // 干系人姓名列表 - if (null != wrapIn.getEmployeeIdentities() && wrapIn.getEmployeeIdentities().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.employeeIdentity).in(wrapIn.getEmployeeIdentities())); - } - // 处理身份 - if (null != wrapIn.getProcessIdentities() && wrapIn.getProcessIdentities().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.processIdentity).in(wrapIn.getProcessIdentities())); - } - // 干系人所属组织名称列表 - if (null != wrapIn.getUnitNames() && wrapIn.getUnitNames().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.unitName).in(wrapIn.getUnitNames())); - } - // 干系人所属顶层组织名称列表 - if (null != wrapIn.getTopUnitNames() && wrapIn.getTopUnitNames().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.topUnitName).in(wrapIn.getTopUnitNames())); - } - // 工作类别 - if (null != wrapIn.getWorkTypes() && wrapIn.getWorkTypes().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.workType).in(wrapIn.getWorkTypes())); - } - // 工作时长类型：短期工作|长期工作 - if (null != wrapIn.getWorkDateTimeType() && wrapIn.getWorkDateTimeType().isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workDateTimeType), wrapIn.getWorkDateTimeType())); - } - // 工作处理状态 - if (null != wrapIn.getWorkProcessStatuses() && wrapIn.getWorkProcessStatuses().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.workProcessStatus).in(wrapIn.getWorkProcessStatuses())); - } - if (null != wrapIn.getInfoStatuses() && wrapIn.getInfoStatuses().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(wrapIn.getInfoStatuses())); - } - // 部署年份 - if (null != wrapIn.getDeployYear() && !wrapIn.getDeployYear().isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.deployYear), wrapIn.getDeployYear())); - } - // 部署月份 - if (null != wrapIn.getDeployMonth() && !wrapIn.getDeployMonth().isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.deployMonth), wrapIn.getDeployMonth())); - } - - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listDetailWorkPerson(String id, WorkCommonSearchFilter wrapIn) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null!"); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkPerson.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal(root.get(OkrWorkPerson_.recordType), "具体工作"); - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workId), id)); - // 干系人姓名列表 - if (null != wrapIn.getEmployeeNames() && wrapIn.getEmployeeNames().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.employeeName).in(wrapIn.getEmployeeNames())); - } - // 干系人姓名列表 - if (null != wrapIn.getEmployeeIdentities() && wrapIn.getEmployeeIdentities().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.employeeIdentity).in(wrapIn.getEmployeeIdentities())); - } - // 处理身份 - if (null != wrapIn.getProcessIdentities() && wrapIn.getProcessIdentities().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.processIdentity).in(wrapIn.getProcessIdentities())); - } - // 干系人所属组织名称列表 - if (null != wrapIn.getUnitNames() && wrapIn.getUnitNames().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.unitName).in(wrapIn.getUnitNames())); - } - // 干系人所属顶层组织名称列表 - if (null != wrapIn.getTopUnitNames() && wrapIn.getTopUnitNames().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.topUnitName).in(wrapIn.getTopUnitNames())); - } - // 工作类别 - if (null != wrapIn.getWorkTypes() && wrapIn.getWorkTypes().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.workType).in(wrapIn.getWorkTypes())); - } - // 工作时长类型：短期工作|长期工作 - if (null != wrapIn.getWorkDateTimeType() && wrapIn.getWorkDateTimeType().isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.workDateTimeType), wrapIn.getWorkDateTimeType())); - } - // 工作处理状态 - if (null != wrapIn.getWorkProcessStatuses() && wrapIn.getWorkProcessStatuses().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.workProcessStatus).in(wrapIn.getWorkProcessStatuses())); - } - if (null != wrapIn.getInfoStatuses() && wrapIn.getInfoStatuses().size() > 0) { - p = cb.and(p, root.get(OkrWorkPerson_.status).in(wrapIn.getInfoStatuses())); - } - // 部署年份 - if (null != wrapIn.getDeployYear() && !wrapIn.getDeployYear().isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.deployYear), wrapIn.getDeployYear())); - } - // 部署月份 - if (null != wrapIn.getDeployMonth() && !wrapIn.getDeployMonth().isEmpty()) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.deployMonth), wrapIn.getDeployMonth())); - } - - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询工作干系人身份列表（去重复） - * - * @param identities_ok - * 排除身份 - * @param identities_error - * 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctEmployeeIdentity(List identities_ok, List identities_error) - throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.id)); - if (identities_ok != null && identities_ok.size() > 0) { - p = cb.and(p, cb.not(root.get(OkrWorkPerson_.employeeIdentity).in(identities_ok))); - } - if (identities_error != null && identities_error.size() > 0) { - p = cb.and(p, cb.not(root.get(OkrWorkPerson_.employeeIdentity).in(identities_error))); - } - cq.select(root.get(OkrWorkPerson_.employeeIdentity)); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据身份名称，从工作干系人信息中查询与该身份有关的所有信息列表 - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkPerson(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkPerson.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.isNotNull(root.get(OkrWorkPerson_.id)); - - if (recordId != null && !recordId.isEmpty() && !"all".equals(recordId)) { - p = cb.and(p, cb.equal(root.get(OkrWorkPerson_.id), recordId)); - } - - Predicate p_employeeIdentity = cb.isNotNull(root.get(OkrWorkPerson_.employeeIdentity)); - p_employeeIdentity = cb.and(p_employeeIdentity, cb.equal(root.get(OkrWorkPerson_.employeeIdentity), identity)); - - p = cb.and(p, p_employeeIdentity); - - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listAllDistinctIdentityWithWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkPerson.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkPerson.class); - Predicate p = cb.equal( root.get(OkrWorkPerson_.workId), workId); - cq.select(root.get(OkrWorkPerson_.employeeIdentity)); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonSearchFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonSearchFactory.java deleted file mode 100644 index 9513c75605..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkPersonSearchFactory.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.Query; - -import org.apache.commons.lang3.StringUtils; - -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrWorkPersonSearchFactory extends AbstractFactory { - - public OkrWorkPersonSearchFactory(Business business) throws Exception { - super(business); - } - - /** - * 根据条件搜索中心工作ID - * @param id - * @param count - * @param sequence - * @param com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.WrapInFilter wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List listCenterWorkPersonNextWithFilter(String id, Integer count, Object sequence, - com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter wrapIn) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkPerson.class ); - String order = wrapIn.getOrder();// 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - - if (order == null || order.isEmpty()) { - order = "DESC"; - } - - Integer index = 1; - sql_stringBuffer.append("SELECT o FROM " + OkrWorkPerson.class.getCanonicalName() + " o where o.workId is null and o.processIdentity = '观察者' "); - - if ((null != sequence)) { - sql_stringBuffer.append(" and o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC") ? "<" : ">") + (" ?" + (index))); - vs.add(sequence); - index++; - } - - //根据标题模糊查询 - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty()) { - sql_stringBuffer.append(" and o.centerTitle like ?" + (index)); - vs.add("%" + wrapIn.getTitle() + "%"); - index++; - } - - //根据信息状态查询，比如：正常，已删除 - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append(" and o.status in ( ?" + (index) + " )"); - vs.add(wrapIn.getQ_statuses()); - index++; - } - - //根据默认的工作类别查询 - if (null != wrapIn.getDefaultWorkTypes() && wrapIn.getDefaultWorkTypes().size() > 0) { - sql_stringBuffer.append(" and o.workType in ( ?" + (index) + " )"); - vs.add(wrapIn.getDefaultWorkTypes()); - index++; - } - - //根据用户身份查询查询 - if (null != wrapIn.getIdentity() && !wrapIn.getIdentity().isEmpty() ) { - sql_stringBuffer.append(" and o.employeeIdentity = ?" + (index) ); - vs.add(wrapIn.getIdentity()); - index++; - } - - sql_stringBuffer.append(" order by o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC") ? "DESC" : "ASC")); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkPerson.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - /** - * 根据条件搜索中心工作ID - * @param id - * @param count - * @param sequence - * @param com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.WrapInFilter wrapIn - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List listCenterWorkPersonPrevWithFilter(String id, Integer count, Object sequence, - com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter wrapIn) throws Exception { - // 先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkPerson.class ); - String order = wrapIn.getOrder();// 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - - if (order == null || order.isEmpty()) { - order = "DESC"; - } - - Integer index = 1; - sql_stringBuffer.append("SELECT o FROM " + OkrWorkPerson.class.getCanonicalName() + " o where o.workId is null and o.processIdentity = '观察者' "); - - if ((null != sequence)) { - sql_stringBuffer.append(" and o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC") ? ">" : "<") + (" ?" + (index))); - vs.add(sequence); - index++; - } - - //根据标题模糊查询 - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty()) { - sql_stringBuffer.append(" and o.centerTitle like ?" + (index)); - vs.add("%" + wrapIn.getTitle() + "%"); - index++; - } - - //根据信息状态查询，比如：正常，已删除 - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append(" and o.status in ( ?" + (index) + " )"); - vs.add(wrapIn.getQ_statuses()); - index++; - } - - //根据默认的工作类别查询 - if (null != wrapIn.getDefaultWorkTypes() && wrapIn.getDefaultWorkTypes().size() > 0) { - sql_stringBuffer.append(" and o.workType in ( ?" + (index) + " )"); - vs.add(wrapIn.getDefaultWorkTypes()); - index++; - } - - //根据用户身份查询查询 - if (null != wrapIn.getIdentity() && !wrapIn.getIdentity().isEmpty() ) { - sql_stringBuffer.append(" and o.employeeIdentity = ?" + (index) ); - vs.add(wrapIn.getIdentity()); - index++; - } - - sql_stringBuffer.append(" order by o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC") ? "DESC" : "ASC")); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkPerson.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults(count).getResultList(); - } - - /** - * 查询符合的中心工作信息总数 - * @param id - * @param count - * @param sequence - * @param com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.WrapInFilter wrapIn - * @return - * @throws Exception - */ - public long getCountForCenterInfoWithFilter( com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkPerson.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append( "SELECT count( o.id ) FROM "+OkrWorkPerson.class.getCanonicalName()+" o where o.workId is null and o.processIdentity = '观察者' " ); - - // 根据标题模糊查询 - if (null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty()) { - sql_stringBuffer.append(" and o.centerTitle like ?" + (index)); - vs.add("%" + wrapIn.getTitle() + "%"); - index++; - } - - // 根据信息状态查询，比如：正常，已删除 - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append(" and o.status in ( ?" + (index) + " )"); - vs.add(wrapIn.getQ_statuses()); - index++; - } - - // 根据默认的工作类别查询 - if (null != wrapIn.getDefaultWorkTypes() && wrapIn.getDefaultWorkTypes().size() > 0) { - sql_stringBuffer.append(" and o.workType in ( ?" + (index) + " )"); - vs.add(wrapIn.getDefaultWorkTypes()); - index++; - } - - //根据用户身份查询查询 - if (null != wrapIn.getIdentity() && !wrapIn.getIdentity().isEmpty()) { - sql_stringBuffer.append(" and o.employeeIdentity = ?" + (index)); - vs.add(wrapIn.getIdentity()); - index++; - } - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkPerson.class ); - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportBaseInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportBaseInfoFactory.java deleted file mode 100644 index 15965449a6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportBaseInfoFactory.java +++ /dev/null @@ -1,666 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.WrapInFilter; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo_; - -/** - * 类 名：OkrWorkReportBaseInfoFactory
- * 实体类：OkrWorkReportBaseInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportBaseInfoFactory extends AbstractFactory { - - public OkrWorkReportBaseInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkReportBaseInfo实体信息对象" ) - public OkrWorkReportBaseInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkReportBaseInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkReportBaseInfo实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportBaseInfo.class); - cq.select(root.get(OkrWorkReportBaseInfo_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkReportBaseInfo实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkReportBaseInfo.class); - Root root = cq.from(OkrWorkReportBaseInfo.class); - Predicate p = root.get(OkrWorkReportBaseInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作ID，查询该工作的最大汇报次序 - * @param id - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作ID，查询该工作的最大汇报次序" ) - public Integer getMaxReportCount( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportBaseInfo.class ); - Root root = cq.from( OkrWorkReportBaseInfo.class); - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.reportCount) ) ); - - Predicate p = cb.equal( root.get( OkrWorkReportBaseInfo_.workId), workId); - - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return 0; - }else{ - return resultList.get(0).getReportCount(); - } - } - - /** - * 根据工作信息ID，获取汇报基础信息ID列表 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，获取汇报基础信息ID列表" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportBaseInfo.class); - Predicate p = cb.equal( root.get(OkrWorkReportBaseInfo_.workId), workId ); - cq.select(root.get( OkrWorkReportBaseInfo_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportBaseInfo.class); - Predicate p = cb.equal( root.get( OkrWorkReportBaseInfo_.centerId ), centerId ); - cq.select(root.get( OkrWorkReportBaseInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listNextWithFilter(String id, Integer count, Object sequence, WrapInFilter wrapIn) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportBaseInfo.class); - String sequenceField = wrapIn.getSequenceField(); - String order = wrapIn.getOrder(); // 排序方式 - if ( StringUtils.isEmpty( order ) ) { - order = "DESC"; - } - if ( StringUtils.isEmpty( sequenceField ) ) { - sequenceField = JpaObject.sequence_FIELDNAME; - } - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkReportBaseInfo.class); - Root root = cq.from(OkrWorkReportBaseInfo.class); - Predicate p = cb.isNotNull( root.get( OkrWorkReportBaseInfo_.id ) ); - if( sequence != null ) { - if( StringUtils.equalsIgnoreCase(order, "DESC" )) { - if( "createTime".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.createTime ), (Date)sequence)); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.sequence ), sequence.toString())); - }else if( "workTitle".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.workTitle ), sequence.toString())); - }else if( "activityName".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.activityName ), sequence.toString())); - }else if( "centerTitle".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.centerTitle ), sequence.toString())); - }else if( "workType".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.workType ), sequence.toString())); - } - }else { - if( "createTime".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.createTime ), (Date)sequence)); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.sequence ), sequence.toString())); - }else if( "workTitle".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.workTitle ), sequence.toString())); - }else if( "activityName".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.activityName ), sequence.toString())); - }else if( "centerTitle".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.centerTitle ), sequence.toString())); - }else if( "workType".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.workType ), sequence.toString())); - } - } - } - - if( StringUtils.isNotEmpty( wrapIn.getTitle() )) { - p = cb.and( p, cb.like(root.get( OkrWorkReportBaseInfo_.centerTitle ), wrapIn.getTitle())); - } - //当前处理人身份 - if( StringUtils.isNotEmpty( wrapIn.getProcessIdentity() )) { - p = cb.and( p, cb.isMember(wrapIn.getProcessIdentity(), root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList ))); - } - //工作处理状态 - if( ListTools.isNotEmpty( wrapIn.getProcessStatusList() )) { - p = cb.and( p, root.get( OkrWorkReportBaseInfo_.processStatus).in( wrapIn.getProcessStatusList() )); - } - - if( ListTools.isNotEmpty( wrapIn.getQ_statuses() )) { - p = cb.and( p, root.get( OkrWorkReportBaseInfo_.status).in( wrapIn.getQ_statuses() )); - } - - if(StringUtils.equalsIgnoreCase(order, "DESC" )) { - if( "createTime".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.createTime) ) ); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.sequence) ) ); - }else if( "workTitle".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.workTitle) ) ); - }else if( "activityName".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.activityName) ) ); - }else if( "centerTitle".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.centerTitle) ) ); - }else if( "workType".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.workType) ) ); - } - }else { - if( "createTime".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.createTime) ) ); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.sequence) ) ); - }else if( "workTitle".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.workTitle) ) ); - }else if( "activityName".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.activityName) ) ); - }else if( "centerTitle".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.centerTitle) ) ); - }else if( "workType".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.workType) ) ); - } - } - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listPrevWithFilter( String id, Integer count, Object sequence, WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportBaseInfo.class); - String sequenceField = wrapIn.getSequenceField(); - String order = wrapIn.getOrder(); // 排序方式 - if ( StringUtils.isEmpty( order ) ) { - order = "DESC"; - } - if ( StringUtils.isEmpty( sequenceField ) ) { - sequenceField = JpaObject.sequence_FIELDNAME; - } - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkReportBaseInfo.class); - Root root = cq.from(OkrWorkReportBaseInfo.class); - Predicate p = cb.isNotNull( root.get( OkrWorkReportBaseInfo_.id ) ); - if( sequence != null ) { - if( StringUtils.equalsIgnoreCase(order, "DESC" )) { - if( "createTime".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.createTime ), (Date)sequence)); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.sequence ), sequence.toString())); - }else if( "workTitle".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.workTitle ), sequence.toString())); - }else if( "activityName".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.activityName ), sequence.toString())); - }else if( "centerTitle".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.centerTitle ), sequence.toString())); - }else if( "workType".equals( sequenceField )) { - p = cb.and( p, cb.greaterThan(root.get( OkrWorkReportBaseInfo_.workType ), sequence.toString())); - } - }else { - if( "createTime".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.createTime ), (Date)sequence)); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.sequence ), sequence.toString())); - }else if( "workTitle".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.workTitle ), sequence.toString())); - }else if( "activityName".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.activityName ), sequence.toString())); - }else if( "centerTitle".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.centerTitle ), sequence.toString())); - }else if( "workType".equals( sequenceField )) { - p = cb.and( p, cb.lessThan(root.get( OkrWorkReportBaseInfo_.workType ), sequence.toString())); - } - } - } - - if( StringUtils.isNotEmpty( wrapIn.getTitle() )) { - p = cb.and( p, cb.like(root.get( OkrWorkReportBaseInfo_.centerTitle ), wrapIn.getTitle())); - } - //当前处理人身份 - if( StringUtils.isNotEmpty( wrapIn.getProcessIdentity() )) { - p = cb.and( p, cb.isMember(wrapIn.getProcessIdentity(), root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList ))); - } - //工作处理状态 - if( ListTools.isNotEmpty( wrapIn.getProcessStatusList() )) { - p = cb.and( p, root.get( OkrWorkReportBaseInfo_.processStatus).in( wrapIn.getProcessStatusList() )); - } - - if( ListTools.isNotEmpty( wrapIn.getQ_statuses() )) { - p = cb.and( p, root.get( OkrWorkReportBaseInfo_.status).in( wrapIn.getQ_statuses() )); - } - - if(StringUtils.equalsIgnoreCase(order, "DESC" )) { - if( "createTime".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.createTime) ) ); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.sequence) ) ); - }else if( "workTitle".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.workTitle) ) ); - }else if( "activityName".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.activityName) ) ); - }else if( "centerTitle".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.centerTitle) ) ); - }else if( "workType".equals( sequenceField )) { - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.workType) ) ); - } - }else { - if( "createTime".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.createTime) ) ); - }else if( JpaObject.sequence_FIELDNAME.equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.sequence) ) ); - }else if( "workTitle".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.workTitle) ) ); - }else if( "activityName".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.activityName) ) ); - }else if( "centerTitle".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.centerTitle) ) ); - }else if( "workType".equals( sequenceField )) { - cq.orderBy( cb.asc( root.get( OkrWorkReportBaseInfo_.workType) ) ); - } - } - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询符合的信息总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getCountWithFilter( WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportBaseInfo.class); - String sequenceField = wrapIn.getSequenceField(); - String order = wrapIn.getOrder(); // 排序方式 - if ( StringUtils.isEmpty( order ) ) { - order = "DESC"; - } - if ( StringUtils.isEmpty( sequenceField ) ) { - sequenceField = JpaObject.sequence_FIELDNAME; - } - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(OkrWorkReportBaseInfo.class); - Predicate p = cb.isNotNull( root.get( OkrWorkReportBaseInfo_.id ) ); - if( StringUtils.isNotEmpty( wrapIn.getTitle() )) { - p = cb.and( p, cb.like(root.get( OkrWorkReportBaseInfo_.centerTitle ), wrapIn.getTitle())); - } - //当前处理人身份 - if( StringUtils.isNotEmpty( wrapIn.getProcessIdentity() )) { - p = cb.and( p, cb.isMember(wrapIn.getProcessIdentity(), root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList ))); - } - //工作处理状态 - if( ListTools.isNotEmpty( wrapIn.getProcessStatusList() )) { - p = cb.and( p, root.get( OkrWorkReportBaseInfo_.processStatus).in( wrapIn.getProcessStatusList() )); - } - - if( ListTools.isNotEmpty( wrapIn.getQ_statuses() )) { - p = cb.and( p, root.get( OkrWorkReportBaseInfo_.status).in( wrapIn.getQ_statuses() )); - } - cq.select( cb.count( root ) ); - return em.createQuery(cq.where(p)).getSingleResult(); - } - - /** - * 根据WorkId查询该工作所有汇报中已经提交的最后一次汇报的内容，如果没有则返回NULL - * @param workId - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo getLastCompletedReport( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportBaseInfo.class ); - Root root = cq.from( OkrWorkReportBaseInfo.class); - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.reportCount) ) ); - Predicate p = cb.equal( root.get( OkrWorkReportBaseInfo_.workId ), workId); - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.activityName ), "已完成" ) ); - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return null; - }else{ - return resultList.get(0); - } - } - - /** - * 根据条件查询汇报ID列表 - * @param workId - * @param activityName - * @param processStatus - * @param processIdentity - * @return - * @throws Exception - */ - public List listByWorkId(String workId, String activityName, String processStatus, String processorIdentity ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportBaseInfo.class); - Predicate p = cb.equal( root.get( OkrWorkReportBaseInfo_.workId), workId ); - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.status ), "正常" ) ); - if( processorIdentity != null && !processorIdentity.isEmpty() ){ - p = cb.and( p, cb.isMember( processorIdentity, root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList ))); - } - if( activityName != null && !activityName.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.activityName ), activityName ) ); - } - if( processStatus != null && !processStatus.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.processStatus ), processStatus ) ); - } - cq.select(root.get( OkrWorkReportBaseInfo_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - /** - * 根据工作ID获取该工作最后一次工作汇报 - * @param workId - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo getLastReportBaseInfo( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is empty, system can not excute query!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportBaseInfo.class ); - Root root = cq.from( OkrWorkReportBaseInfo.class); - cq.orderBy( cb.desc( root.get( OkrWorkReportBaseInfo_.submitTime ) ) ); - - Predicate p = cb.equal( root.get( OkrWorkReportBaseInfo_.workId ), workId ); - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.status ), "正常" )); - - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return null; - }else{ - return resultList.get(0); - } - } - - public List listProcessingReportIdsByWorkId(String workId) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( " workId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportBaseInfo.class); - Predicate p = cb.equal( root.get( OkrWorkReportBaseInfo_.workId ), workId ); - p = cb.and( p, cb.notEqual( root.get( OkrWorkReportBaseInfo_.activityName ), "已完成" )); - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.status ), "正常" )); - cq.select(root.get( OkrWorkReportBaseInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询工作汇报创建者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctCreatorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkReportBaseInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportBaseInfo_.creatorIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportBaseInfo_.creatorIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkReportBaseInfo_.creatorIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询工作汇报当前处理者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctCurrentProcessorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - /* - CriteriaQuery cq = cb.createQuery( List.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - cq.select(root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList )); - List allList = em.createQuery(cq).getResultList(); - */ - - CriteriaQuery cq = cb.createQuery( OkrWorkReportBaseInfo.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - List os = em.createQuery(cq.select(root)).getResultList(); - List allList = new ArrayList<>(); - for (OkrWorkReportBaseInfo o : os) { - allList.add(o.getCurrentProcessorIdentityList()); - } - - if(ListTools.isNotEmpty( allList )) { - HashSet hashSet = new HashSet(); - for( List identities : allList ) { - if(ListTools.isNotEmpty( identities )) { - for( String identity : identities ) { - if( ListTools.isNotEmpty(identities_ok) && identities_ok.contains( identity ) ){ - continue; - } - if( ListTools.isNotEmpty(identities_error) && identities_error.contains( identity ) ){ - continue; - } - hashSet.add( identity ); - } - } - } - List result = new ArrayList<>(); - result.addAll(hashSet); - return result; - } - return null; - - } - /** - * 查询工作汇报阅知领导身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctReadleadersIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - /* - CriteriaQuery cq = cb.createQuery( List.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - cq.select(root.get( OkrWorkReportBaseInfo_.readLeadersIdentityList )); - List allList = em.createQuery(cq).getResultList(); - */ - - CriteriaQuery cq = cb.createQuery( OkrWorkReportBaseInfo.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - List os = em.createQuery(cq.select(root)).getResultList(); - List allList = new ArrayList<>(); - for (OkrWorkReportBaseInfo o : os) { - allList.add(o.getReadLeadersIdentityList()); - } - - if(ListTools.isNotEmpty( allList )) { - HashSet hashSet = new HashSet(); - for( List identities : allList ) { - if(ListTools.isNotEmpty( identities )) { - for( String identity : identities ) { - if( ListTools.isNotEmpty(identities_ok) && identities_ok.contains( identity ) ){ - continue; - } - if( ListTools.isNotEmpty(identities_error) && identities_error.contains( identity ) ){ - continue; - } - hashSet.add( identity ); - } - } - } - List result = new ArrayList<>(); - result.addAll(hashSet); - return result; - } - return null; - } - /** - * 查询工作汇报者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctReporterIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkReportBaseInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportBaseInfo_.reporterIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportBaseInfo_.reporterIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkReportBaseInfo_.reporterIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 查询工作管理者，督办员身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctWorkAdminIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkReportBaseInfo.class); - - Predicate p = cb.isNotNull( root.get( OkrWorkReportBaseInfo_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportBaseInfo_.workAdminIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportBaseInfo_.workAdminIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkReportBaseInfo_.workAdminIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - - /** - * 根据身份名称，从工作汇报信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInReportBaseInfo( String identity, String recordId ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportBaseInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportBaseInfo.class ); - Root root = cq.from( OkrWorkReportBaseInfo.class ); - Predicate p = cb.isNotNull(root.get( OkrWorkReportBaseInfo_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportBaseInfo_.id ), recordId ) ); - } - - Predicate p_creatorIdentity = cb.isNotNull(root.get( OkrWorkReportBaseInfo_.creatorIdentity )); - p_creatorIdentity = cb.and( p_creatorIdentity, cb.equal( root.get( OkrWorkReportBaseInfo_.creatorIdentity ), identity ) ); - - Predicate p_reporterIdentity = cb.isNotNull(root.get( OkrWorkReportBaseInfo_.reporterIdentity )); - p_reporterIdentity = cb.and( p_reporterIdentity, cb.equal( root.get( OkrWorkReportBaseInfo_.reporterIdentity ), identity ) ); - - Predicate p_currentProcessorIdentity = cb.isNotNull(root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList )); - p_currentProcessorIdentity = cb.and( p_currentProcessorIdentity, cb.isMember( identity, root.get( OkrWorkReportBaseInfo_.currentProcessorIdentityList ) ) ); - - Predicate p_readleadersIdentity = cb.isNotNull(root.get( OkrWorkReportBaseInfo_.readLeadersIdentityList )); - p_readleadersIdentity = cb.and( p_readleadersIdentity, cb.isMember( identity, root.get( OkrWorkReportBaseInfo_.readLeadersIdentityList )) ); - - Predicate p_workAdminIdentity = cb.isNotNull(root.get( OkrWorkReportBaseInfo_.workAdminIdentity )); - p_workAdminIdentity = cb.and( p_workAdminIdentity, cb.equal( root.get( OkrWorkReportBaseInfo_.workAdminIdentity ), identity ) ); - - Predicate p_identity = cb.or( p_creatorIdentity, p_reporterIdentity, p_currentProcessorIdentity, p_readleadersIdentity, p_workAdminIdentity ); - - p = cb.and( p, p_identity ); - - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportDetailInfoFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportDetailInfoFactory.java deleted file mode 100644 index 1548c9020a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportDetailInfoFactory.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo_; - -/** - * 类 名：OkrWorkReportDetailInfoFactory
- * 实体类：OkrWorkReportDetailInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportDetailInfoFactory extends AbstractFactory { - - public OkrWorkReportDetailInfoFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkReportDetailInfo实体信息对象" ) - public OkrWorkReportDetailInfo get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkReportDetailInfo.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkReportDetailInfo实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportDetailInfo.class); - cq.select(root.get(OkrWorkReportDetailInfo_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkReportDetailInfo实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkReportDetailInfo.class); - Root root = cq.from(OkrWorkReportDetailInfo.class); - Predicate p = root.get(OkrWorkReportDetailInfo_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，获取汇报详细信息ID列表 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，获取汇报详细信息ID列表" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportDetailInfo.class); - Predicate p = cb.equal( root.get(OkrWorkReportDetailInfo_.workId), workId ); - cq.select(root.get( OkrWorkReportDetailInfo_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportDetailInfo.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportDetailInfo.class); - Predicate p = cb.equal( root.get( OkrWorkReportDetailInfo_.centerId ), centerId ); - cq.select(root.get( OkrWorkReportDetailInfo_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportPersonLinkFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportPersonLinkFactory.java deleted file mode 100644 index c53159bfde..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportPersonLinkFactory.java +++ /dev/null @@ -1,368 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportPersonLink_; - -/** - * 类 名：OkrWorkReportPersonLinkFactory
- * 实体类：OkrWorkReportPersonLink
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportPersonLinkFactory extends AbstractFactory { - - public OkrWorkReportPersonLinkFactory(Business business) throws Exception { - super(business); - } - -// @MethodDescribe( "获取指定Id的OkrWorkReportPersonLink实体信息对象" ) - public OkrWorkReportPersonLink get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkReportPersonLink.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkReportPersonLink实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportPersonLink.class); - cq.select(root.get(OkrWorkReportPersonLink_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkReportPersonLink实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkReportPersonLink.class); - Root root = cq.from(OkrWorkReportPersonLink.class); - Predicate p = root.get(OkrWorkReportPersonLink_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByReportId( String reportId ) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportPersonLink.class); - Predicate p = cb.equal( root.get(OkrWorkReportPersonLink_.workReportId), reportId ); - cq.select(root.get( OkrWorkReportPersonLink_.id) ); - return em.createQuery(cq.where(p)).setMaxResults(5000).getResultList(); - } - - /** - * 根据工作信息ID，获取汇报处理链信息ID列表 - * @param workId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据工作信息ID，获取汇报处理链信息ID列表" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportPersonLink.class); - Predicate p = cb.equal( root.get(OkrWorkReportPersonLink_.workId), workId ); - cq.select(root.get( OkrWorkReportPersonLink_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ - //@MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportPersonLink.class); - Predicate p = cb.equal( root.get( OkrWorkReportPersonLink_.centerId ), centerId ); - cq.select(root.get( OkrWorkReportPersonLink_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据汇报ID获取该汇报的最高处理过程级别 - * @param reportId - * @return - * @throws Exception - */ - //@MethodDescribe( "根据汇报ID获取该汇报的最高处理过程级别" ) - public Integer getMaxProcessLevel(String reportId) throws Exception { - if( reportId == null || reportId.isEmpty() ){ - throw new Exception( " reportId is null!" ); - } - EntityManager em = this.entityManagerContainer().get( OkrWorkReportPersonLink.class ); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportPersonLink.class ); - Root root = cq.from( OkrWorkReportPersonLink.class); - cq.orderBy( cb.desc( root.get( OkrWorkReportPersonLink_.processLevel ) ) ); - Predicate p = cb.equal( root.get( OkrWorkReportPersonLink_.workReportId ), reportId ); - List resultList = em.createQuery(cq.where(p)).getResultList(); - if( resultList == null || resultList.size() == 0 ){ - return 0; - }else{ - return resultList.get(0).getProcessLevel(); - } - } - //@MethodDescribe( "根据汇报ID和处理等级来查询指定等级的处理人" ) - public List getProcessPersonLinkInfoByReportAndLevel(String reportId, Integer processLevel, String processorIdentity, String processStatus, String status ) throws Exception { - if( reportId == null || reportId.isEmpty() ){ - throw new Exception( " reportId is null!" ); - } - if( processLevel == null || processLevel < 0 ){ - throw new Exception( " processLevel is invalid!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportPersonLink.class); - Predicate p = cb.equal( root.get( OkrWorkReportPersonLink_.workReportId ), reportId ); - p = cb.and( p, cb.equal( root.get( OkrWorkReportPersonLink_.processLevel ), processLevel )); - if( processorIdentity != null && !processorIdentity.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportPersonLink_.processorIdentity ), processorIdentity )); - } - if( processStatus != null && !processStatus.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportPersonLink_.processStatus ), processStatus )); - } - if( status != null && !status.isEmpty() ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportPersonLink_.status ), status )); - } - cq.select(root.get( OkrWorkReportPersonLink_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - - @SuppressWarnings("unchecked") - public List listNextWithFilter(String id, Integer count, Object sequence, WorkPersonSearchFilter wrapIn) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportPersonLink.class); - String order = wrapIn.getOrder(); // 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - if ( order == null || order.isEmpty() ) { - order = "DESC"; - } - sql_stringBuffer.append( "SELECT o FROM " + OkrWorkReportPersonLink.class.getCanonicalName() + " o where 1=1" ); - if ((null != sequence)) { - sql_stringBuffer.append( " and o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "<" : ">" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ( null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%" + wrapIn.getTitle() + "%" ); - index++; - } - //当前处理人身份 - if ( null != wrapIn.getProcessIdentity() && !wrapIn.getProcessIdentity().isEmpty() ) { - sql_stringBuffer.append( " and o.processorIdentity = ?" + (index) ); - vs.add( wrapIn.getProcessIdentity() ); - index++; - } - //工作处理状态 - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "DESC" : "ASC" )); - - //logger.debug( sql_stringBuffer.toString() ); - //logger.debug( vs ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkReportPersonLink.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults( count ).getResultList(); - } - - - @SuppressWarnings("unchecked") - public List listPrevWithFilter( String id, Integer count, Object sequence, WorkPersonSearchFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportPersonLink.class ); - String order = wrapIn.getOrder(); // 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - if (order == null || order.isEmpty()) { - order = "DESC"; - } - sql_stringBuffer.append( "SELECT o FROM " + OkrWorkReportPersonLink.class.getCanonicalName() + " o where 1=1" ); - if ((null != sequence)) { - sql_stringBuffer.append( " and o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? ">" : "<" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ( null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%" + wrapIn.getTitle() + "%" ); - index++; - } - //当前处理人身份 - if ( null != wrapIn.getProcessIdentity() && !wrapIn.getProcessIdentity().isEmpty() ) { - sql_stringBuffer.append( " and o.processorIdentity = ?" + (index) ); - vs.add( wrapIn.getProcessIdentity() ); - index++; - } - //工作处理状态 - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "DESC" : "ASC" )); - - //logger.debug( sql_stringBuffer.toString() ); - //logger.debug( vs ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkReportPersonLink.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults( count ).getResultList(); - } - - /** - * 查询符合的信息总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter( WorkPersonSearchFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportPersonLink.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append( "SELECT count( o.id ) FROM " + OkrWorkReportPersonLink.class.getCanonicalName() + " o where 1=1" ); - - if ( null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.title like ?" + (index) ); - vs.add( "%" + wrapIn.getTitle() + "%" ); - index++; - } - //当前处理人身份 - if ( null != wrapIn.getProcessIdentity() && !wrapIn.getProcessIdentity().isEmpty() ) { - sql_stringBuffer.append( " and o.processorIdentity = ?" + (index) ); - vs.add( wrapIn.getProcessIdentity() ); - index++; - } - //工作处理状态 - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - - //logger.debug( sql_stringBuffer.toString() ); - //logger.debug( vs ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkReportPersonLink.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - - /** - * 查询工作汇报处理者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctProcessorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkReportPersonLink.class); - Predicate p = cb.isNotNull( root.get( OkrWorkReportPersonLink_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportPersonLink_.processorIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportPersonLink_.processorIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkReportPersonLink_.processorIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从工作汇报处理者信息中查询与该身份有关的所有信息列表 - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInReportPersonInfo(String identity, String recordId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportPersonLink.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportPersonLink.class ); - Root root = cq.from( OkrWorkReportPersonLink.class ); - Predicate p = cb.isNotNull(root.get( OkrWorkReportPersonLink_.id )); - - if( recordId != null && !recordId.isEmpty() && !"all".equals( recordId ) ){ - p = cb.and( p, cb.equal( root.get( OkrWorkReportPersonLink_.id ), recordId ) ); - } - - Predicate p_processorIdentity = cb.isNotNull(root.get( OkrWorkReportPersonLink_.processorIdentity )); - p_processorIdentity = cb.and( p_processorIdentity, cb.equal( root.get( OkrWorkReportPersonLink_.processorIdentity ), identity ) ); - p = cb.and( p, p_processorIdentity ); - return em.createQuery(cq.where(p)).getResultList(); - } - - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportProcessLogFactory.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportProcessLogFactory.java deleted file mode 100644 index 3cbd0d62ee..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/factory/OkrWorkReportProcessLogFactory.java +++ /dev/null @@ -1,341 +0,0 @@ -package com.x.okr.assemble.control.factory; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.okr.assemble.control.AbstractFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.WrapInFilter; -import com.x.okr.entity.OkrWorkReportProcessLog; -import com.x.okr.entity.OkrWorkReportProcessLog_; - -/** - * 类 名：OkrWorkReportProcessLogFactory
- * 实体类：OkrWorkReportProcessLog
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportProcessLogFactory extends AbstractFactory { - - public OkrWorkReportProcessLogFactory(Business business) throws Exception { - super(business); - } - - //@MethodDescribe( "获取指定Id的OkrWorkReportProcessLog实体信息对象" ) - public OkrWorkReportProcessLog get( String id ) throws Exception { - return this.entityManagerContainer().find(id, OkrWorkReportProcessLog.class, ExceptionWhen.none); - } - - //@MethodDescribe( "列示全部的OkrWorkReportProcessLog实体信息列表" ) - public List listAll() throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportProcessLog.class); - cq.select(root.get(OkrWorkReportProcessLog_.id)); - return em.createQuery(cq).getResultList(); - } - - //@MethodDescribe( "列示指定Id的OkrWorkReportProcessLog实体信息列表" ) - public List list(List ids) throws Exception { - if( ids == null || ids.size() == 0 ){ - return new ArrayList(); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(OkrWorkReportProcessLog.class); - Root root = cq.from(OkrWorkReportProcessLog.class); - Predicate p = root.get(OkrWorkReportProcessLog_.id).in(ids); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据工作信息ID，获取汇报处理记录信息ID列表 - * @param workId - * @return - * @throws Exception - */ -// @MethodDescribe( "根据工作信息ID，获取汇报处理记录信息ID列表" ) - public List listByWorkId(String workId) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from( OkrWorkReportProcessLog.class); - Predicate p = cb.equal( root.get(OkrWorkReportProcessLog_.workId), workId ); - cq.select(root.get( OkrWorkReportProcessLog_.id) ); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 根据中心工作ID，列示所有的数据信息 - * @param centerId 中心工作 - * @return - * @throws Exception - */ -// @MethodDescribe( "根据中心工作ID，列示所有的信息" ) - public List listByCenterWorkId(String centerId) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( " centerId is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportProcessLog.class); - Predicate p = cb.equal( root.get( OkrWorkReportProcessLog_.centerId ), centerId ); - cq.select(root.get( OkrWorkReportProcessLog_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - @SuppressWarnings("unchecked") - public List listNextWithFilter(String id, Integer count, Object sequence, WrapInFilter wrapIn) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportProcessLog.class); - String order = wrapIn.getOrder(); // 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - if ( order == null || order.isEmpty() ) { - order = "DESC"; - } - sql_stringBuffer.append( "SELECT o FROM " + OkrWorkReportProcessLog.class.getCanonicalName() + " o where 1=1" ); - if ((null != sequence)) { - sql_stringBuffer.append( " and o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "<" : ">" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ( null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.reportTitle like ?" + (index) ); - vs.add( "%" + wrapIn.getTitle() + "%" ); - index++; - } - //当前处理人身份 - if ( null != wrapIn.getProcessIdentity() && !wrapIn.getProcessIdentity().isEmpty() ) { - sql_stringBuffer.append( " and o.processorIdentity = ?" + (index) ); - vs.add( wrapIn.getProcessIdentity() ); - index++; - } - //工作处理状态 - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "DESC" : "ASC" )); - - //logger.debug( sql_stringBuffer.toString() ); - //logger.debug( vs ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkReportProcessLog.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults( count ).getResultList(); - } - - - @SuppressWarnings("unchecked") - public List listPrevWithFilter( String id, Integer count, Object sequence, WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportProcessLog.class ); - String order = wrapIn.getOrder(); // 排序方式 - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - if (order == null || order.isEmpty()) { - order = "DESC"; - } - sql_stringBuffer.append( "SELECT o FROM " + OkrWorkReportProcessLog.class.getCanonicalName() + " o where 1=1" ); - if ((null != sequence)) { - sql_stringBuffer.append( " and o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? ">" : "<" ) + ( " ?" + (index))); - vs.add(sequence); - index++; - } - if ( null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.reportTitle like ?" + (index) ); - vs.add( "%" + wrapIn.getTitle() + "%" ); - index++; - } - //当前处理人身份 - if ( null != wrapIn.getProcessIdentity() && !wrapIn.getProcessIdentity().isEmpty() ) { - sql_stringBuffer.append( " and o.processorIdentity = ?" + (index) ); - vs.add( wrapIn.getProcessIdentity() ); - index++; - } - //工作处理状态 - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - sql_stringBuffer.append( " order by o." + wrapIn.getSequenceField() + " " + (StringUtils.equalsIgnoreCase(order, "DESC" ) ? "DESC" : "ASC" )); - - //logger.debug( sql_stringBuffer.toString() ); - //logger.debug( vs ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkReportProcessLog.class); - // 为查询设置所有的参数值 - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return query.setMaxResults( count ).getResultList(); - } - - /** - * 查询符合的信息总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public long getCountWithFilter( WrapInFilter wrapIn ) throws Exception { - //先获取上一页最后一条的sequence值，如果有值的话，以此sequence值作为依据取后续的count条数据 - EntityManager em = this.entityManagerContainer().get( OkrWorkReportProcessLog.class ); - List vs = new ArrayList<>(); - StringBuffer sql_stringBuffer = new StringBuffer(); - Integer index = 1; - - sql_stringBuffer.append( "SELECT count( o.id ) FROM " + OkrWorkReportProcessLog.class.getCanonicalName() + " o where 1=1" ); - - if ( null != wrapIn.getTitle() && !wrapIn.getTitle().isEmpty() ) { - sql_stringBuffer.append( " and o.reportTitle like ?" + (index) ); - vs.add( "%" + wrapIn.getTitle() + "%" ); - index++; - } - //当前处理人身份 - if ( null != wrapIn.getProcessIdentity() && !wrapIn.getProcessIdentity().isEmpty() ) { - sql_stringBuffer.append( " and o.processorIdentity = ?" + (index) ); - vs.add( wrapIn.getProcessIdentity() ); - index++; - } - //工作处理状态 - if (null != wrapIn.getProcessStatusList() && wrapIn.getProcessStatusList().size() > 0) { - sql_stringBuffer.append( " and o.processStatus in ( ?" + (index) + " )" ); - vs.add( wrapIn.getProcessStatusList() ); - index++; - } - if (null != wrapIn.getQ_statuses() && wrapIn.getQ_statuses().size() > 0) { - sql_stringBuffer.append( " and o.status in ( ?" + (index) + " )" ); - vs.add( wrapIn.getQ_statuses() ); - index++; - } - - //logger.debug( sql_stringBuffer.toString() ); - //logger.debug( vs ); - - Query query = em.createQuery( sql_stringBuffer.toString(), OkrWorkReportProcessLog.class ); - - for (int i = 0; i < vs.size(); i++) { - query.setParameter(i + 1, vs.get(i)); - } - return (Long) query.getSingleResult(); - } - - /** - * 根据reportId, 处理人，环节名称 以及处理状态 确定一条处理记录 - * @param id - * @param processorIdentity - * @return - * @throws Exception - */ - public List listByReportIdAndProcessor(String reportId, String activityName, String processorIdentity, String processStatus ) throws Exception { - if( reportId == null || reportId.isEmpty() ){ - throw new Exception( " reportId is null!" ); - } - if( activityName == null || activityName.isEmpty() ){ - throw new Exception( " activityName is null!" ); - } - if( processorIdentity == null || processorIdentity.isEmpty() ){ - throw new Exception( " processorIdentity is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportProcessLog.class); - Predicate p = cb.equal( root.get( OkrWorkReportProcessLog_.workReportId ), reportId ); - p = cb.and( p, cb.equal( root.get( OkrWorkReportProcessLog_.activityName ), activityName)); - p = cb.and( p, cb.equal( root.get( OkrWorkReportProcessLog_.processorIdentity ), processorIdentity)); - p = cb.and( p, cb.equal( root.get( OkrWorkReportProcessLog_.processStatus ), processStatus)); - - cq.select(root.get( OkrWorkReportProcessLog_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - public List listIdsByReportId(String id) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( " id is null!" ); - } - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(OkrWorkReportProcessLog.class); - Predicate p = cb.equal( root.get( OkrWorkReportProcessLog_.workReportId ), id ); - cq.select(root.get( OkrWorkReportProcessLog_.id)); - return em.createQuery(cq.where(p)).getResultList(); - } - - /** - * 查询工作汇报处理者身份列表（去重复） - * @param identities_ok 排除身份 - * @param identities_error 排除身份 - * @return - * @throws Exception - */ - public List listAllDistinctProcessorIdentity(List identities_ok, List identities_error) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( String.class ); - Root root = cq.from(OkrWorkReportProcessLog.class); - Predicate p = cb.isNotNull( root.get( OkrWorkReportProcessLog_.id ) ); - if( identities_ok != null && identities_ok.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportProcessLog_.processorIdentity ).in( identities_ok )) ); - } - if( identities_error != null && identities_error.size() > 0 ){ - p = cb.and( p, cb.not(root.get( OkrWorkReportProcessLog_.processorIdentity ).in( identities_error )) ); - } - cq.select(root.get( OkrWorkReportProcessLog_.processorIdentity )); - return em.createQuery(cq.where(p)).getResultList().stream().distinct().collect(Collectors.toList()); - } - /** - * 根据身份名称，从工作汇报处理日志信息中查询与该身份有关的所有信息列表 - * @param identity - * @return - * @throws Exception - */ - public List listErrorIdentitiesInReportProcessLog(String identity) throws Exception { - EntityManager em = this.entityManagerContainer().get(OkrWorkReportProcessLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery( OkrWorkReportProcessLog.class ); - Root root = cq.from( OkrWorkReportProcessLog.class ); - Predicate p = cb.isNotNull(root.get( OkrWorkReportProcessLog_.id )); - Predicate p_processorIdentity = cb.isNotNull(root.get( OkrWorkReportProcessLog_.processorIdentity )); - p_processorIdentity = cb.and( p_processorIdentity, cb.equal( root.get( OkrWorkReportProcessLog_.processorIdentity ), identity ) ); - p = cb.and( p, p_processorIdentity ); - return em.createQuery(cq.where(p)).getResultList(); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/ActionApplication.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/ActionApplication.java deleted file mode 100644 index 70a8a4c9bb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/ActionApplication.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.x.okr.assemble.control.jaxrs; - -import java.util.Set; - -import javax.ws.rs.ApplicationPath; - -import com.x.base.core.project.jaxrs.AbstractActionApplication; -import com.x.okr.assemble.control.jaxrs.appraise.OkrWorkAppraiseAction; -import com.x.okr.assemble.control.jaxrs.export.OkrExportAction; -import com.x.okr.assemble.control.jaxrs.identity.OkrSystemErrorIdentityProcessAction; -import com.x.okr.assemble.control.jaxrs.login.OkrLoginAction; -import com.x.okr.assemble.control.jaxrs.login.OkrLogoutAction; -import com.x.okr.assemble.control.jaxrs.mind.OkrWorkMindAction; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.OkrAttachmentFileInfoAction; -import com.x.okr.assemble.control.jaxrs.okrauthorize.OkrWorkAuthorizeAction; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.OkrCenterWorkInfoAction; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.OkrCenterWorkInfoAdminAction; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.OkrConfigSecretaryAction; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.OkrConfigSystemAction; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.OkrConfigWorkLevelAction; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.OkrConfigWorkTypeAction; -import com.x.okr.assemble.control.jaxrs.okrtask.OkrAnonymousTaskAction; -import com.x.okr.assemble.control.jaxrs.okrtask.OkrTaskAction; -import com.x.okr.assemble.control.jaxrs.okrtask.OkrTaskAdminAction; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.OkrTaskHandledAction; -import com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.OkrWorkAuthorizeRecordAction; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.OkrWorkBaseInfoAction; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.OkrWorkBaseInfoAdminAction; -import com.x.okr.assemble.control.jaxrs.okrworkchat.OkrWorkChatAction; -import com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.OkrWorkDetailInfoAction; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.OkrWorkDynamicsAction; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.OkrWorkReportBaseInfoAction; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.OkrWorkReportBaseInfoAdminAction; -import com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.OkrWorkReportDetailInfoAction; -import com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.OkrWorkReportPersonLinkAction; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.OkrWorkReportProcessLogAction; -import com.x.okr.assemble.control.jaxrs.statistic.OkrStatisticReportContentAction; -import com.x.okr.assemble.control.jaxrs.statistic.OkrStatisticReportStatusAction; -import com.x.okr.assemble.control.jaxrs.uuid.UUIDAction; -import com.x.okr.assemble.control.jaxrs.workimport.OkrWorkImportAction; - -@ApplicationPath("jaxrs") -public class ActionApplication extends AbstractActionApplication { - - public Set> getClasses() { - this.classes.add(OkrWorkAuthorizeAction.class); - this.classes.add(OkrCenterWorkInfoAction.class); - this.classes.add(OkrWorkBaseInfoAction.class); - this.classes.add(OkrAttachmentFileInfoAction.class); - this.classes.add(OkrConfigSystemAction.class); - this.classes.add(OkrConfigWorkLevelAction.class); - this.classes.add(OkrConfigWorkTypeAction.class); - this.classes.add(OkrConfigSecretaryAction.class); - this.classes.add(OkrTaskAction.class); - this.classes.add(OkrAnonymousTaskAction.class); - this.classes.add(OkrTaskHandledAction.class); - this.classes.add(OkrWorkAuthorizeRecordAction.class); - this.classes.add(OkrWorkDetailInfoAction.class); - this.classes.add(OkrWorkDynamicsAction.class); - this.classes.add(OkrSystemErrorIdentityProcessAction.class); - this.classes.add(OkrWorkReportBaseInfoAction.class); - this.classes.add(OkrWorkReportDetailInfoAction.class); - this.classes.add(OkrWorkReportPersonLinkAction.class); - this.classes.add(OkrWorkReportProcessLogAction.class); - this.classes.add(OkrLoginAction.class); - this.classes.add(OkrLogoutAction.class); - this.classes.add(OkrWorkChatAction.class); - this.classes.add(UUIDAction.class); - this.classes.add(OkrWorkMindAction.class); - - this.classes.add(OkrCenterWorkInfoAdminAction.class); - this.classes.add(OkrWorkBaseInfoAdminAction.class); - this.classes.add(OkrTaskAdminAction.class); - this.classes.add(OkrWorkReportBaseInfoAdminAction.class); - - this.classes.add(OkrStatisticReportContentAction.class); - this.classes.add(OkrStatisticReportStatusAction.class); - - this.classes.add(OkrExportAction.class); - this.classes.add(OkrWorkImportAction.class); - this.classes.add(OkrWorkAppraiseAction.class); - - return this.classes; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrAnonyJaxrsFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrAnonyJaxrsFilter.java deleted file mode 100644 index ba9ff16c2a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrAnonyJaxrsFilter.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.x.okr.assemble.control.jaxrs; - -import javax.servlet.annotation.WebFilter; - -import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter; - -@WebFilter(urlPatterns = { "/jaxrs/task/*" }, asyncSupported = true) -public class OkrAnonyJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter { - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrJaxrsFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrJaxrsFilter.java deleted file mode 100644 index afd08290db..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/OkrJaxrsFilter.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.x.okr.assemble.control.jaxrs; - -import javax.servlet.annotation.WebFilter; - -import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; - -/** - * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务 - */ -@WebFilter(urlPatterns = { - "/jaxrs/mind/*", - "/jaxrs/uuid/*", - "/jaxrs/login/*", - "/jaxrs/logout/*", - "/jaxrs/okrauthorize/*", - "/jaxrs/okrworkchat/*", - "/jaxrs/okrattachmentfileinfo/*", - "/jaxrs/okrcenterworkinfo/*", - "/jaxrs/okrconfigsystem/*", - "/jaxrs/okrconfigworklevel/*", - "/jaxrs/okrconfigworktype/*", - "/jaxrs/okrconfigsecretary/*", - "/jaxrs/okrtask/*", - "/jaxrs/okrtaskhandled/*", - "/jaxrs/okrworkauthorizerecord/*", - "/jaxrs/okrworkbaseinfo/*", - "/jaxrs/okrworkappraise/*", - "/jaxrs/okrworkdetailinfo/*", - "/jaxrs/okrworkdynamics/*", - "/jaxrs/okrworkprocesslink/*", - "/jaxrs/okrworkreportbaseinfo/*", - "/jaxrs/okrworkreportdetailinfo/*", - "/jaxrs/okrworkreportpersonlink/*", - "/jaxrs/okrworkreportprocesslog/*", - "/jaxrs/admin/okrcenterworkinfo/*", - "/jaxrs/admin/okrworkbaseinfo/*", - "/jaxrs/admin/okrtask/*", - "/jaxrs/admin/okrtaskhandled/*", - "/jaxrs/admin/okrworkreportbaseinfo/*", - "/jaxrs/streportcontent/*", - "/jaxrs/streportstatus/*", - "/jaxrs/error/identity/*", - "/jaxrs/export/*", - "/jaxrs/import/*" -}, asyncSupported = true) -public class OkrJaxrsFilter extends CipherManagerUserJaxrsFilter { - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonQueryFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonQueryFilter.java deleted file mode 100644 index 258d06b18f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonQueryFilter.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.x.okr.assemble.control.jaxrs; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.gson.GsonPropertyObject; - -public class WorkCommonQueryFilter extends GsonPropertyObject { - - @FieldDescribe( "用于模糊查询的中心工作标题." ) - private String title; - - @FieldDescribe( "用于查询的用户身份." ) - private String identity; - - @FieldDescribe( "用于查询的中心工作ID列表." ) - private List centerIds; //部署时使用 - - @FieldDescribe( "用于查询的中心工作信息状态列表：正常、已归档、已删除." ) - private List q_statuses; - - @FieldDescribe( "用于查询的中心工作处理状态列表：草稿、执行中、已完成." ) - private List processStatusList; - - @FieldDescribe( "用于查询的中心工作类别列表." ) - private List defaultWorkTypes; - - @FieldDescribe( "用于列表排序的属性." ) - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe( "用于列表排序的方式." ) - private String order = "DESC"; - // 是否查询下级组织 - private boolean querySubOrganizatin = true; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public List getCenterIds() { - return centerIds; - } - - public void setCenterIds(List centerIds) { - this.centerIds = centerIds; - } - - public List getQ_statuses() { - return q_statuses; - } - - public void setQ_statuses(List q_statuses) { - this.q_statuses = q_statuses; - } - - public List getProcessStatusList() { - return processStatusList; - } - - public void setProcessStatusList(List processStatusList) { - this.processStatusList = processStatusList; - } - - public List getDefaultWorkTypes() { - return defaultWorkTypes; - } - - public void setDefaultWorkTypes(List defaultWorkTypes) { - this.defaultWorkTypes = defaultWorkTypes; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public boolean isQuerySubOrganizatin() { - return querySubOrganizatin; - } - - public void setQuerySubOrganizatin(boolean querySubOrganizatin) { - this.querySubOrganizatin = querySubOrganizatin; - } - - public String getIdentity() { - return identity; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - - /** - * 添加查询的信息状态 - * - * @param status - */ - public void addQueryInfoStatus(String status) { - if (q_statuses == null) { - q_statuses = new ArrayList(); - } - if (!q_statuses.contains(status)) { - q_statuses.add(status); - } - } - - /** - * 添加查询的部署处理状态 - * @param status - */ - public void addQueryWorkProcessStatus( String status ) { - if( processStatusList == null ){ - processStatusList = new ArrayList(); - } - if( !processStatusList.contains( status )){ - processStatusList.add( status ); - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonSearchFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonSearchFilter.java deleted file mode 100644 index 1d6bfb639a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkCommonSearchFilter.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.x.okr.assemble.control.jaxrs; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.gson.GsonPropertyObject; - -public class WorkCommonSearchFilter extends GsonPropertyObject { - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String order = "DESC"; - - private List employeeNames = null; - - private List employeeIdentities = null; - - private List processIdentities = null; - - private List unitNames = null; - - private List topUnitNames = null; - - private List workTypes = null; - - private String workTitle = null; - - private String deployYear = null; - - private String deployMonth = null; - - private String workDateTimeType = null; - - private List workProcessStatuses = null; - - private String infoType = "CenterWork"; // CenterWork | Work - - private List infoStatuses = null; - - private Integer maxCharacterNumber = 30; - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public List getEmployeeNames() { - return employeeNames; - } - - public void setEmployeeNames(List employeeNames) { - this.employeeNames = employeeNames; - } - - public List getProcessIdentities() { - return processIdentities; - } - - public void setProcessIdentities(List processIdentities) { - this.processIdentities = processIdentities; - } - - public List getUnitNames() { - return unitNames; - } - - public void setUnitNames(List unitNames) { - this.unitNames = unitNames; - } - - public List getTopUnitNames() { - return topUnitNames; - } - - public void setTopUnitNames(List topUnitNames) { - this.topUnitNames = topUnitNames; - } - - public List getWorkTypes() { - return workTypes; - } - - public void setWorkTypes(List workTypes) { - this.workTypes = workTypes; - } - - public String getWorkTitle() { - return workTitle; - } - - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getDeployYear() { - return deployYear; - } - - public void setDeployYear(String deployYear) { - this.deployYear = deployYear; - } - - public String getDeployMonth() { - return deployMonth; - } - - public void setDeployMonth(String deployMonth) { - this.deployMonth = deployMonth; - } - - public String getWorkDateTimeType() { - return workDateTimeType; - } - - public void setWorkDateTimeType(String workDateTimeType) { - this.workDateTimeType = workDateTimeType; - } - - public List getWorkProcessStatuses() { - return workProcessStatuses; - } - - public void setWorkProcessStatuses(List workProcessStatuses) { - this.workProcessStatuses = workProcessStatuses; - } - - public String getInfoType() { - return infoType; - } - - public void setInfoType(String infoType) { - this.infoType = infoType; - } - - - public List getInfoStatuses() { - return infoStatuses; - } - - public void setInfoStatuses(List infoStatuses) { - this.infoStatuses = infoStatuses; - } - - public List getEmployeeIdentities() { - return employeeIdentities; - } - - public void setEmployeeIdentities(List employeeIdentities) { - this.employeeIdentities = employeeIdentities; - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryInfoStatus( String status ) { - if( infoStatuses == null ){ - infoStatuses = new ArrayList(); - } - if( !infoStatuses.contains( status )){ - infoStatuses.add( status ); - } - } - - /** - * 添加查询的员工姓名 - * @param status - */ - public void addQueryEmployeeName( String employeeName ) { - if( employeeNames == null ){ - employeeNames = new ArrayList(); - } - if( !employeeNames.contains( employeeName )){ - employeeNames.add( employeeName ); - } - } - - /** - * 添加查询的员工姓名 - * @param status - */ - public void addQueryEmployeeIdentities( String employeeIdentity ) { - if( employeeIdentities == null ){ - employeeIdentities = new ArrayList(); - } - if( !employeeIdentities.contains( employeeIdentity )){ - employeeIdentities.add( employeeIdentity ); - } - } - - /** - * 添加查询的组织名称 - * @param status - */ - public void addQueryUnitName( String unitName ) { - if( unitNames == null ){ - unitNames = new ArrayList(); - } - if( !unitNames.contains( unitName )){ - unitNames.add( unitName ); - } - } - - /** - * 添加查询的组织名称 - * @param status - */ - public void addQueryTopUnitName( String topUnitName ) { - if( topUnitNames == null ){ - topUnitNames = new ArrayList(); - } - if( !topUnitNames.contains( topUnitName )){ - topUnitNames.add( topUnitName ); - } - } - - /** - * 添加查询的部署处理状态 - * @param status - */ - public void addQueryWorkProcessStatus( String status ) { - if( workProcessStatuses == null ){ - workProcessStatuses = new ArrayList(); - } - if( !workProcessStatuses.contains( status )){ - workProcessStatuses.add( status ); - } - } - - /** - * 添加查询的部署处理身份 - * @param status - */ - public void addQueryProcessIdentity( String identity ) { - if( processIdentities == null ){ - processIdentities = new ArrayList(); - } - if( !processIdentities.contains( identity )){ - processIdentities.add(identity); - } - } - - public Integer getMaxCharacterNumber() { - return maxCharacterNumber; - } - - public void setMaxCharacterNumber(Integer maxCharacterNumber) { - this.maxCharacterNumber = maxCharacterNumber; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkPersonSearchFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkPersonSearchFilter.java deleted file mode 100644 index a6d9b61cd6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/WorkPersonSearchFilter.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.x.okr.assemble.control.jaxrs; -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.gson.GsonPropertyObject; - -public class WorkPersonSearchFilter extends GsonPropertyObject { - - private String query_deployerUnitName; - - private String query_deployerName; - - private String query_deployerTopUnitName; - - private String title ; - - private String processIdentity; - - private List workIds; - - private List processStatusList; - - private List deployerNames; - - private List deployerUnitNames; - - private List deployerTopUnitNames; - - private String query_creatorName; - - private String query_creatorUnitName; - - private String query_creatorTopUnitName; - - private List creatorNames; - - private List creatorUnitNames; - - private List creatorTopUnitNames; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String key; - - private String order = "DESC"; - - private List q_statuses; - - public String getQuery_deployerName() { - return query_deployerName; - } - - public void setQuery_deployerName(String query_deployerName) { - this.query_deployerName = query_deployerName; - } - - public String getQuery_deployerUnitName() { - return query_deployerUnitName; - } - - public void setQuery_deployerUnitName(String query_deployerUnitName) { - this.query_deployerUnitName = query_deployerUnitName; - } - - public String getQuery_deployerTopUnitName() { - return query_deployerTopUnitName; - } - - public void setQuery_deployerTopUnitName(String query_deployerTopUnitName) { - this.query_deployerTopUnitName = query_deployerTopUnitName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getProcessIdentity() { - return processIdentity; - } - - public void setProcessIdentity(String processIdentity) { - this.processIdentity = processIdentity; - } - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public List getProcessStatusList() { - return processStatusList; - } - - public void setProcessStatusList(List processStatusList) { - this.processStatusList = processStatusList; - } - - public List getDeployerNames() { - return deployerNames; - } - - public void setDeployerNames(List deployerNames) { - this.deployerNames = deployerNames; - } - - public List getDeployerUnitNames() { - return deployerUnitNames; - } - - public void setDeployerUnitNames(List deployerUnitNames) { - this.deployerUnitNames = deployerUnitNames; - } - - public List getDeployerTopUnitNames() { - return deployerTopUnitNames; - } - - public void setDeployerTopUnitNames(List deployerTopUnitNames) { - this.deployerTopUnitNames = deployerTopUnitNames; - } - - public String getQuery_creatorName() { - return query_creatorName; - } - - public void setQuery_creatorName(String query_creatorName) { - this.query_creatorName = query_creatorName; - } - - public String getQuery_creatorUnitName() { - return query_creatorUnitName; - } - - public void setQuery_creatorUnitName(String query_creatorUnitName) { - this.query_creatorUnitName = query_creatorUnitName; - } - - public String getQuery_creatorTopUnitName() { - return query_creatorTopUnitName; - } - - public void setQuery_creatorTopUnitName(String query_creatorTopUnitName) { - this.query_creatorTopUnitName = query_creatorTopUnitName; - } - - public List getCreatorNames() { - return creatorNames; - } - - public void setCreatorNames(List creatorNames) { - this.creatorNames = creatorNames; - } - - public List getCreatorUnitNames() { - return creatorUnitNames; - } - - public void setCreatorUnitNames(List creatorUnitNames) { - this.creatorUnitNames = creatorUnitNames; - } - - public List getCreatorTopUnitNames() { - return creatorTopUnitNames; - } - - public void setCreatorTopUnitNames(List creatorTopUnitNames) { - this.creatorTopUnitNames = creatorTopUnitNames; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public List getQ_statuses() { - return q_statuses; - } - - public void setQ_statuses(List q_statuses) { - this.q_statuses = q_statuses; - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryInfoStatus( String status ) { - if( q_statuses == null ){ - q_statuses = new ArrayList(); - } - if( !q_statuses.contains( status )){ - q_statuses.add( status ); - } - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryProcessStatus( String status ) { - if( processStatusList == null ){ - processStatusList = new ArrayList(); - } - if( !processStatusList.contains( status )){ - processStatusList.add( status ); - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/ActionWorkAppraiseStatusSync.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/ActionWorkAppraiseStatusSync.java deleted file mode 100644 index 123c3a7e49..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/ActionWorkAppraiseStatusSync.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.appraise; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.dataadapter.workflow.WorkComplexGetter; -import com.x.okr.assemble.control.jaxrs.appraise.exception.ExceptionWorkAppraiseProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.BaseAction; -import com.x.okr.assemble.control.service.OkrWorkAppraiseSyncService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; - -public class ActionWorkAppraiseStatusSync extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionWorkAppraiseStatusSync.class ); - private OkrWorkAppraiseSyncService okrWorkAppraiseSyncService = new OkrWorkAppraiseSyncService(); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - WorkComplexGetter.Wo woWorkComplex =null; - Boolean check = true; - Wi wi = null; - String title = null; - String workId = null; - String status = null; - String wf_jobId = null; - String wf_workId = null; - try { - wi = this.convertToWrapIn( jsonElement, Wi.class ); - title = wi.getTitle(); - workId = wi.getWorkId(); - status = wi.getAppraiseStatus(); - wf_jobId = wi.getWf_jobId(); - wf_workId = wi.getWf_workId(); - if( title!= null && title.length() > 80 ) { - title = title.substring(0, 80) + "..."; - } - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWorkAppraiseProcess( e, "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - //1、判断工作信息是否存在，如果存在则进行数据存储，如果不存在，就忽略 - //2、根据WORKID或者JOBID，获取当前流程的信息，包括当前审核环节等信息 - if( check ){ - //获取流程信息 - woWorkComplex = new WorkComplexGetter().getWorkComplex(wf_workId); - } - - //为新的读者添加权限 - if( check ){ - if( ListTools.isNotEmpty( wi.getReaderList() )) { - okrWorkPersonService.addWatcherForWork(workId, wi.getReaderList()); - } - } - if( check ){ - try { - okrWorkAppraiseSyncService.updateAppraiseWfInfo( effectivePerson, title, workId, wf_jobId, wf_workId, status, woWorkComplex ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWorkAppraiseProcess( e, "系统在同步考核流程信息时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe( "考核流程标题" ) - private String title = null; - - @FieldDescribe( "工作ID" ) - private String workId = null; - - @FieldDescribe( "流程JOBID" ) - private String wf_jobId = null; - - @FieldDescribe( "流程WORKID" ) - private String wf_workId = null; - - @FieldDescribe( "流程审核状态" ) - private String appraiseStatus = null; - - @FieldDescribe( "需要为工作信息添加的读者权限" ) - private List readerList = null; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getWf_jobId() { - return wf_jobId; - } - - public void setWf_jobId(String wf_jobId) { - this.wf_jobId = wf_jobId; - } - - public String getWf_workId() { - return wf_workId; - } - - public void setWf_workId(String wf_workId) { - this.wf_workId = wf_workId; - } - - public String getAppraiseStatus() { - return appraiseStatus; - } - - public void setAppraiseStatus(String appraiseStatus) { - this.appraiseStatus = appraiseStatus; - } - - public List getReaderList() { - return readerList; - } - - public void setReaderList(List readerList) { - this.readerList = readerList; - } - } - - public static class Wo extends WoId { - public Wo( String id ) { - setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/BaseAction.java deleted file mode 100644 index 2e8659387a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/BaseAction.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.appraise; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; - -public class BaseAction extends StandardJaxrsAction { - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/OkrWorkAppraiseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/OkrWorkAppraiseAction.java deleted file mode 100644 index 5c92f02fcd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/OkrWorkAppraiseAction.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.appraise; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -/** - * 具体工作项有短期工作还长期工作，短期工作不需要自动启动定期汇报，由人工撰稿汇报即可 - */ - -@Path("okrworkappraise") -@JaxrsDescribe("工作考核信息管理服务") -public class OkrWorkAppraiseAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkAppraiseAction.class); - - @JaxrsMethodDescribe(value = "通知OKR系统同步流程审批状态信息", action = ActionWorkAppraiseStatusSync.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void syncStatus(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - if (check) { - try { - result = new ActionWorkAppraiseStatusSync().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ActionWorkAppraiseStatusSync got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/exception/ExceptionWorkAppraiseProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/exception/ExceptionWorkAppraiseProcess.java deleted file mode 100644 index 5e9c6e9135..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/appraise/exception/ExceptionWorkAppraiseProcess.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.appraise.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkAppraiseProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkAppraiseProcess(Throwable e, String message ) { - super( message, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportContentExport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportContentExport.java deleted file mode 100644 index d4a665a870..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportContentExport.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.export; - -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -public class ActionStatisticReportContentExport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStatisticReportContentExport.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String flag ) { - ActionResult result = new ActionResult<>(); - File dir = new File("download/temp"); - if (!dir.exists()) { - dir.mkdirs(); - } - byte[] byteArray = getByteFromFile("download/temp/export_" + flag + ".xls"); - try { - Wo wo = new Wo( byteArray, this.contentType(false, "汇报内容统计.xls"), this.contentDisposition(false, "汇报内容统计.xls")); - result.setData( wo ); - } catch (Exception e) { - logger.warn("system export file got an exception"); - logger.error(e); - } - return result; - } - - - private byte[] getByteFromFile(String fileFullName) { - ByteArrayOutputStream buffer = null; - BufferedInputStream input = null; - - File file = new File(fileFullName); - if (file.exists()) { - try { - input = new BufferedInputStream(new FileInputStream(file)); - buffer = new ByteArrayOutputStream(); - int nRead; - byte[] data = new byte[1024]; - while ((nRead = input.read(data, 0, data.length)) != -1) { - buffer.write(data, 0, nRead); - } - buffer.flush(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - input.close(); - } catch (IOException e) { - e.printStackTrace(); - } - try { - buffer.close(); - } catch (IOException e) { - e.printStackTrace(); - } - try { - buffer.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - if (file.exists()) { - file.delete(); - } - } - return buffer.toByteArray(); - } - return null; - } - - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportStatusExport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportStatusExport.java deleted file mode 100644 index 746031e462..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/ActionStatisticReportStatusExport.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.export; - -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -public class ActionStatisticReportStatusExport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStatisticReportStatusExport.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String flag ) { - ActionResult result = new ActionResult<>(); - File dir = new File("download/temp"); - if (!dir.exists()) { - dir.mkdirs(); - } - byte[] byteArray = getByteFromFile("download/temp/export_" + flag + ".xls"); - try { - Wo wo = new Wo( byteArray, this.contentType(false, "汇报提交情况统计.xls"), this.contentDisposition(false, "汇报提交情况统计.xls")); - result.setData( wo ); - } catch (Exception e) { - logger.warn("system export file got an exception"); - logger.error(e); - } - return result; - } - - - private byte[] getByteFromFile(String fileFullName) { - ByteArrayOutputStream buffer = null; - BufferedInputStream input = null; - - File file = new File(fileFullName); - if (file.exists()) { - try { - input = new BufferedInputStream(new FileInputStream(file)); - buffer = new ByteArrayOutputStream(); - int nRead; - byte[] data = new byte[1024]; - while ((nRead = input.read(data, 0, data.length)) != -1) { - buffer.write(data, 0, nRead); - } - buffer.flush(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - input.close(); - } catch (IOException e) { - e.printStackTrace(); - } - try { - buffer.close(); - } catch (IOException e) { - e.printStackTrace(); - } - try { - buffer.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - if (file.exists()) { - file.delete(); - } - } - return buffer.toByteArray(); - } - return null; - } - - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/BaseAction.java deleted file mode 100644 index e3c7658ae0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/BaseAction.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.export; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; - -public class BaseAction extends StandardJaxrsAction { - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/OkrExportAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/OkrExportAction.java deleted file mode 100644 index ddb317b5c0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/export/OkrExportAction.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.export; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("export") -@JaxrsDescribe("文件导出服务") -public class OkrExportAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrExportAction.class); - - @JaxrsMethodDescribe(value = "导出汇报内容统计表", action = ActionStatisticReportContentExport.class) - @GET - @Path("statisticreportcontent/{flag}/stream") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void statisticReportContent(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("文件标识") @PathParam("flag") String flag) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStatisticReportContentExport().execute(request, effectivePerson, flag); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据中心工作ID获取中心工作所有附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "导出汇报状态统计表", action = ActionStatisticReportContentExport.class) - @GET - @Path("statisticreportstatus/{flag}/stream") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void statisticReportStatus(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("文件标识") @PathParam("flag") String flag) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStatisticReportContentExport().execute(request, effectivePerson, flag); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据中心工作ID获取中心工作所有附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionChangeIdentity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionChangeIdentity.java deleted file mode 100644 index 0f255da684..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionChangeIdentity.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionIdentityCheck; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionNewIdentityEmpty; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionNewIdentityNotExists; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionOldIdentityEmpty; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionRecordIdEmpty; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionRecordTypeEmpty; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionTableNameEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionWrapInConvert; - -public class ActionChangeIdentity extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionChangeIdentity.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - Wi wrapIn = null; - Boolean identityExists = false; - Boolean check = true; - - if (check) { - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if (check) { - if (wrapIn.getOldIdentity() == null || wrapIn.getOldIdentity().isEmpty()) { - check = false; - Exception exception = new ExceptionOldIdentityEmpty(); - result.error(exception); - } - } - - if (check) { - if (wrapIn.getNewIdentity() == null || wrapIn.getNewIdentity().isEmpty()) { - check = false; - Exception exception = new ExceptionNewIdentityEmpty(); - result.error(exception); - } - } - - if (check) { - if (wrapIn.getRecordType() == null || wrapIn.getRecordType().isEmpty()) { - check = false; - Exception exception = new ExceptionRecordTypeEmpty(); - result.error(exception); - } - } - - if (check) { - if (wrapIn.getTableName() == null || wrapIn.getTableName().isEmpty()) { - check = false; - Exception exception = new ExceptionTableNameEmpty(); - result.error(exception); - } - } - - if (check) { - if (wrapIn.getRecordId() == null || wrapIn.getRecordId().isEmpty()) { - check = false; - Exception exception = new ExceptionRecordIdEmpty(); - result.error(exception); - } - } - - if (check) { - try { - identityExists = userManagerService.isIdentityExsits( wrapIn.getNewIdentity() ); - if (!identityExists) { - check = false; - Exception exception = new ExceptionNewIdentityNotExists(wrapIn.getNewIdentity()); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionIdentityCheck(e, wrapIn.getNewIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if (check) { - try { - WrapOutString wrapOutString = new WrapOutString(); - okrSystemIdentityOperatorService.changeUserIdentity(wrapIn.getOldIdentity(), wrapIn.getNewIdentity(), - wrapIn.getRecordType(), wrapIn.getTableName(), wrapIn.getRecordId()); - okrSystemIdentityOperatorService.checkAllAbnormalIdentityInSystem(wrapIn.getOldIdentity(), null); - wrapOutString.setValue("数据身份信息变更完成"); - result.setData(wrapOutString); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system check identity got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe( "需要变更的无效的身份名称." ) - private String oldIdentity = ""; - - @FieldDescribe( "用户更新的新的身份名称." ) - private String newIdentity = ""; - - @FieldDescribe( "需要进行变更的数据类型：工作信息|工作汇报|待办已办|交流动态|系统配置|数据统计." ) - private String recordType = ""; - - @FieldDescribe( "需要进行变更的数据所涉及的数据表中具体的数据的ID值" ) - private String recordId = ""; - - @FieldDescribe( "需要进行变更的数据所涉及的数据表." ) - private String tableName = ""; - - public String getOldIdentity() { - return oldIdentity; - } - - public String getNewIdentity() { - return newIdentity; - } - - public void setOldIdentity(String oldIdentity) { - this.oldIdentity = oldIdentity; - } - - public void setNewIdentity(String newIdentity) { - this.newIdentity = newIdentity; - } - - public String getRecordType() { - return recordType; - } - - public String getTableName() { - return tableName; - } - - public void setRecordType(String recordType) { - this.recordType = recordType; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getRecordId() { - return recordId; - } - - public void setRecordId(String recordId) { - this.recordId = recordId; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionCheck.java deleted file mode 100644 index f6105673bc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionCheck.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -public class ActionCheck extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionCheck.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - WrapOutString wrapOutString = new WrapOutString(); - okrSystemIdentityOperatorService.checkAllAbnormalIdentityInSystem(); - result.setData(wrapOutString); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system check identity got an exception."); - logger.error(e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionErrorInfoFilterListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionErrorInfoFilterListNextWithFilter.java deleted file mode 100644 index fc010b1da8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionErrorInfoFilterListNextWithFilter.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.entity.OkrErrorSystemIdentityInfo; -import org.apache.commons.lang3.StringUtils; - -public class ActionErrorInfoFilterListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionErrorInfoFilterListNextWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - EffectivePerson currentPerson = this.effectivePerson(request); - Wi wrapIn = null; - Boolean check = true; - - if (check) { - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - wrapIn = new Wi(); - } - } - if (check) { - if( !"xadmin".equalsIgnoreCase( currentPerson.getName() )) { - try { - if (!okrUserInfoService.getIsOkrManager(currentPerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(currentPerson.getDistinguishedName(), - ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - } - - if (check) { - if ( StringUtils.isNotEmpty( wrapIn.getIdentity()) ) { - equalsMap.put("identity", wrapIn.getIdentity()); - } - } - - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, false, wrapIn.getOrder()); - } catch (Exception e) { - result.error(e); - logger.error(e, currentPerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe("用于查询身份名称.") - private String identity = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getIdentity() { - return identity; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - - } - - public static class Wo extends OkrErrorSystemIdentityInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrErrorSystemIdentityInfo.class, Wo.class, null, Wo.Excludes); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetErrorRecords.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetErrorRecords.java deleted file mode 100644 index a878416162..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetErrorRecords.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.identity.entity.ErrorIdentityRecord; -import com.x.okr.assemble.control.jaxrs.identity.exception.ExceptionFilterIdentityEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.entity.OkrErrorIdentityRecords; - -public class ActionGetErrorRecords extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetErrorRecords.class ); - - @SuppressWarnings("unchecked") - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrErrorIdentityRecords errorIdentityRecords = new OkrErrorIdentityRecords(); - String identity = null; - String content = null; - List errorRecordsList = null; - Wi wrapIn = null; - Boolean check = true; - - if (check) { - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - wrapIn = new Wi(); - } - } - if (check) { - try { - if ( !okrUserInfoService.getIsOkrManager( effectivePerson.getDistinguishedName() ) ) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(effectivePerson.getDistinguishedName(), - ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - identity = wrapIn.getIdentity(); - if (identity == null || identity.isEmpty()) { - check = false; - Exception exception = new ExceptionFilterIdentityEmpty(); - result.error(exception); - } - } - if (check) { - try { - errorIdentityRecords = okrSystemIdentityQueryService.getErrorIdentityRecords(identity); - if (errorIdentityRecords != null) { - content = errorIdentityRecords.getRecordsJson(); - } else { - content = "{}"; - } - if (content != null && !"{}".equals(content)) { - Gson gson = XGsonBuilder.instance(); - errorRecordsList = (List) gson.fromJson(content, new TypeToken>() { }.getType()); - } - result.setData(errorRecordsList); - } catch (Exception e) { - result.error(e); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe( "用于查询身份名称." ) - private String identity = null; - - @FieldDescribe( "用于列表排序的属性." ) - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe( "用于列表排序的方式." ) - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - public void setRank(Long rank) { - this.rank = rank; - } - public String getSequenceField() { - return sequenceField; - } - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - public String getOrder() { - return order; - } - public void setOrder(String order) { - this.order = order; - } - public String getIdentity() { - return identity; - } - public void setIdentity(String identity) { - this.identity = identity; - } - - } - - public static class Wo { - - private String identity = null; - - private String recordType = "未知类别"; - - private List errorRecords = null; - - public String getIdentity() { - return identity; - } - public String getRecordType() { - return recordType; - } - public List getErrorRecords() { - return errorRecords; - } - public void setIdentity(String identity) { - this.identity = identity; - } - public void setRecordType(String recordType) { - this.recordType = recordType; - } - public void setErrorRecords(List errorRecords) { - this.errorRecords = errorRecords; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetOkrErrorIdentityRecords.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetOkrErrorIdentityRecords.java deleted file mode 100644 index cdbd078a2e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionGetOkrErrorIdentityRecords.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.entity.OkrErrorSystemIdentityInfo; - -public class ActionGetOkrErrorIdentityRecords extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionGetOkrErrorIdentityRecords.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - EffectivePerson currentPerson = this.effectivePerson(request); - Wi wrapIn = null; - Boolean check = true; - - if (check) { - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - wrapIn = new Wi(); - } - } - if (check) { - try { - if (!okrUserInfoService.getIsOkrManager(currentPerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(currentPerson.getDistinguishedName(), - ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - - if (check) { - if (wrapIn.getIdentity() != null && !wrapIn.getIdentity().isEmpty()) { - equalsMap.put("identity", wrapIn.getIdentity()); - } - } - - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, false, wrapIn.getOrder()); - } catch (Exception e) { - result.error(e); - logger.error(e, currentPerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe("用于查询身份名称.") - private String identity = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getIdentity() { - return identity; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - - } - - public static class Wo extends OkrErrorSystemIdentityInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrErrorSystemIdentityInfo.class, Wo.class, null, Wo.Excludes); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionReplaceOrganWithCheckTable.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionReplaceOrganWithCheckTable.java deleted file mode 100644 index 7942222859..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionReplaceOrganWithCheckTable.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.update.UpdateOldUnitToNewUnit; - -/** - * 根据对照表，替换相关的记录中的人员、身份、组织信息 - * - */ -public class ActionReplaceOrganWithCheckTable extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionReplaceOrganWithCheckTable.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - WrapOutString wrapOutString = new WrapOutString(); - UpdateOldUnitToNewUnit updateOldUnitToNewUnit = new UpdateOldUnitToNewUnit(); - updateOldUnitToNewUnit.processReplace(); - result.setData(wrapOutString); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system check identity got an exception."); - logger.error(e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionTestReplace.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionTestReplace.java deleted file mode 100644 index c2ae9bbd46..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/ActionTestReplace.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.update.UpdateOldUnitToNewUnit; - -public class ActionTestReplace extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionTestReplace.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - WrapOutString wrapOutString = new WrapOutString(); - UpdateOldUnitToNewUnit updateOldUnitToNewUnit = new UpdateOldUnitToNewUnit(); - updateOldUnitToNewUnit.processReplace(); - result.setData(wrapOutString); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system check identity got an exception."); - logger.error(e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/BaseAction.java deleted file mode 100644 index 968fba7c61..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/BaseAction.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrSystemIdentityOperatorService; -import com.x.okr.assemble.control.service.OkrSystemIdentityQueryService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrSystemIdentityOperatorService okrSystemIdentityOperatorService = new OkrSystemIdentityOperatorService(); - protected OkrSystemIdentityQueryService okrSystemIdentityQueryService = new OkrSystemIdentityQueryService(); - protected OkrUserManagerService userManagerService = new OkrUserManagerService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/OkrSystemErrorIdentityProcessAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/OkrSystemErrorIdentityProcessAction.java deleted file mode 100644 index 47dea2a043..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/OkrSystemErrorIdentityProcessAction.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("error/identity") -@JaxrsDescribe("工作管理系统数据身份检查服务") -public class OkrSystemErrorIdentityProcessAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrSystemErrorIdentityProcessAction.class); - - @JaxrsMethodDescribe(value = "对系统中的所有数据信息进行身份检查", action = ActionCheck.class) - @GET - @Path("check") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void check(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionCheck().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统对系统中的所有数据信息进行身份检查过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "Test对所有数据的人员姓名，身份以及组织名称进行替换", action = ActionReplaceOrganWithCheckTable.class) - @GET - @Path("test_replace") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void testReplaceAll(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionReplaceOrganWithCheckTable().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统对系统中的所有数据信息进行身份检查过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据要求将为指定的数据替换身份信息", action = ActionChangeIdentity.class) - @PUT - @Path("change") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void changeIdentity(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionChangeIdentity().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据要求将为指定的数据替换身份信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据条件分页查询有问题的身份信息", action = ActionErrorInfoFilterListNextWithFilter.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void errorInfoFilterListNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("上一页最后一条信息的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionErrorInfoFilterListNextWithFilter().execute(request, effectivePerson, id, count, - jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据条件分页查询有问题的身份信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据条件查询身份有问题的工作管理数据信息", action = ActionGetErrorRecords.class) - @PUT - @Path("detail") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getErrorRecords(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionGetErrorRecords().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据条件查询身份有问题的工作管理数据信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据条件分页查询身份有问题工作管理数据信息", action = ActionGetOkrErrorIdentityRecords.class) - @PUT - @Path("errorrecords/filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getOkrErrorIdentityRecords(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("上一页最后一条信息的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionGetOkrErrorIdentityRecords().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据条件分页查询身份有问题工作管理数据信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecord.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecord.java deleted file mode 100644 index 8d8119b7bc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecord.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.entity; - -import java.util.Date; - -public class ErrorIdentityRecord { - private String id = null; - private String identity = null; - private String tableName = null; - private String title = null; - private Date createTime = null; - - public ErrorIdentityRecord() { - super(); - } - - public ErrorIdentityRecord(String id, String identity, String tableName, String title, Date createTime) { - super(); - this.id = id; - this.identity = identity; - this.tableName = tableName; - this.title = title; - this.createTime = createTime; - } - - public String getId() { - return id; - } - public String getIdentity() { - return identity; - } - public String getTitle() { - return title; - } - public Date getCreateTime() { - return createTime; - } - public void setId(String id) { - this.id = id; - } - public void setIdentity(String identity) { - this.identity = identity; - } - public void setTitle(String title) { - this.title = title; - } - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecords.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecords.java deleted file mode 100644 index 8fd07a0542..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/entity/ErrorIdentityRecords.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.entity; - -import java.util.List; - -public class ErrorIdentityRecords { - private String identity = null; - private String recordType = "未知类别"; - private List errorRecords = null; - - public String getIdentity() { - return identity; - } - public String getRecordType() { - return recordType; - } - public List getErrorRecords() { - return errorRecords; - } - public void setIdentity(String identity) { - this.identity = identity; - } - public void setRecordType(String recordType) { - this.recordType = recordType; - } - public void setErrorRecords(List errorRecords) { - this.errorRecords = errorRecords; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionFilterIdentityEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionFilterIdentityEmpty.java deleted file mode 100644 index afcadd9ce9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionFilterIdentityEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionFilterIdentityEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionFilterIdentityEmpty() { - super("进行查询的身份名称为空，无法继续进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionIdentityCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionIdentityCheck.java deleted file mode 100644 index 66da4726ce..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionIdentityCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionIdentityCheck extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionIdentityCheck( Throwable e, String identity ) { - super("身份信息检查时发生异常。identity:" + identity, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityEmpty.java deleted file mode 100644 index 1c9c2ef7df..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionNewIdentityEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionNewIdentityEmpty() { - super("旧的身份名称为空，无法继续进行身份替换操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityNotExists.java deleted file mode 100644 index 3e161ef39e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionNewIdentityNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionNewIdentityNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionNewIdentityNotExists( String identity ) { - super("用户身份不存在。identity:" + identity ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionOldIdentityEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionOldIdentityEmpty.java deleted file mode 100644 index fb276491b5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionOldIdentityEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOldIdentityEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOldIdentityEmpty() { - super("旧的身份名称为空，无法继续进行身份替换操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordIdEmpty.java deleted file mode 100644 index 4b45ad34cd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionRecordIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionRecordIdEmpty() { - super("需要替换的记录ID为空，无法继续进行身份替换操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordTypeEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordTypeEmpty.java deleted file mode 100644 index ed185fcab8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionRecordTypeEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionRecordTypeEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionRecordTypeEmpty() { - super("需要替换的数据类别为空，无法继续进行身份替换操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionTableNameEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionTableNameEmpty.java deleted file mode 100644 index d6e11e385c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/identity/exception/ExceptionTableNameEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.identity.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTableNameEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTableNameEmpty() { - super("需要替换的数据表名为空，无法继续进行身份替换操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionGetLoginUser.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionGetLoginUser.java deleted file mode 100644 index a218116c52..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionGetLoginUser.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; - -public class ActionGetLoginUser extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetLoginUser.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - result.setData( okrUserCache ); - } catch (Exception e) { - logger.warn( "获取登入用户信息时发生异常。" ); - logger.error( e, effectivePerson, request, null); - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogin.java deleted file mode 100644 index 65486eb2b8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogin.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login; - -import java.io.Serializable; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.login.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.login.exception.ExceptionUserHasNoProxyIdentity; -import com.x.okr.assemble.control.jaxrs.login.exception.ExceptionUserIdentityQuery; -import com.x.okr.assemble.control.jaxrs.login.exception.ExceptionUserProxyQuery; - -public class ActionLogin extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionLogin.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - List ids = null; - String identity = null; - OkrUserCache okrUserCache = null; - boolean hasIdentity = false; - Wi wrapIn = null; - Boolean check = true; - - if (check) { - try {//获取传入的参数，主要是loginIdentity(登录身份) - wrapIn = this.convertToWrapIn( jsonElement, Wi.class); - } catch (Exception e) { - wrapIn = new Wi(); - } - } - - if (wrapIn != null) { - if ( StringUtils.isNotEmpty(wrapIn.getLoginIdentity()) ) { - try { //查询用户是否拥有传入的身份名称 - hasIdentity = okrUserManagerService.hasIdentity( effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserProxyQuery(e, effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if ( hasIdentity ) {//用户拥有传入的身份， 以指定的身份登录 - try { - okrUserCache = setUserLoginIdentity( request, effectivePerson, wrapIn.getLoginIdentity() ); - result.setData(okrUserCache); - } catch (Exception e) { - Exception exception = new ExceptionGetOkrUserCache(e, effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } else {// 用户自己没有传入的身份，查询用户是否有该身份的代理配置（秘书） - try { - ids = okrConfigSecretaryService.listIdsByLeaderIdentity(effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity()); - if (ListTools.isEmpty(ids)) {//用户没有指定身份的代理权限，无法登录系统 - //以用户自己的主要身份进行登录 - identity = okrUserManagerService.getIdentityWithPerson( effectivePerson.getDistinguishedName() ); - if( StringUtils.isNotEmpty( identity )) { - System.out.println( "用户使用身份：" + identity + " 登录系统......" ); - try { - okrUserCache = setUserLoginIdentity( request, effectivePerson, identity ); - result.setData(okrUserCache); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - }else { - check = false; - Exception exception = new ExceptionUserHasNoProxyIdentity( effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity()); - result.error(exception); - } - } else {// 顺利查询到身份代理配置信息，向cache里新增用户相关信息 - okrUserCache = setUserLoginIdentity(request, effectivePerson, wrapIn.getLoginIdentity()); - result.setData(okrUserCache); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserProxyQuery(e, effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - } else { // 没有传入身份，即以自己的第一个身份登入系统 - if (!"xadmin".equals( effectivePerson.getDistinguishedName().toLowerCase()) ) {//查询是不是xadmin用户，如果不是xadmin，则查询自己的第一个身份 - try { - identity = okrUserManagerService.getIdentityWithPerson( effectivePerson.getDistinguishedName() ); - if (identity != null && !identity.isEmpty()) { - System.out.println( "用户使用身份：" + identity + " 登录系统......" ); - okrUserCache = setUserLoginIdentity( request, effectivePerson, identity ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserIdentityQuery(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } else { - try { - okrUserCache = setUserXadmin(request, effectivePerson); - } catch (Exception e) { - Exception exception = new ExceptionGetOkrUserCache(e, effectivePerson.getDistinguishedName(), wrapIn.getLoginIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - result.setData( okrUserCache ); - } - - if( check && okrUserCache!= null ) {//判断是否拥有工作管理权限 - if( effectivePerson.isManager() ) { - okrUserCache.setOkrManager( true ); - } - if(okrUserManagerService.isHasPlatformRole(okrUserCache.getLoginUserName(), "OKRManager")) { - okrUserCache.setOkrManager( true ); - } - if(okrUserManagerService.isOkrWorkManager(okrUserCache.getLoginIdentityName())) { - okrUserCache.setOkrManager( true ); - } - } - } else { - check = false; - result.error(new Exception("请求传入的参数'wrapIn'为空，无法继续登录应用!")); - } - - return result; - } - - public static class Wi extends GsonPropertyObject implements Serializable{ - private static final long serialVersionUID = -5076990764713538973L; - - @FieldDescribe( "登录身份名称" ) - private String loginIdentity = null; - public String getLoginIdentity() { - return loginIdentity; - } - public void setLoginIdentity(String loginIdentity) { - this.loginIdentity = loginIdentity; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogout.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogout.java deleted file mode 100644 index a0a69d5b61..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/ActionLogout.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login; - -import java.io.Serializable; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.okr.assemble.control.OkrUserCache; - -public class ActionLogout extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - @SuppressWarnings("unused") - Boolean check = true; - - return result; - } - - public static class Wi extends GsonPropertyObject implements Serializable{ - - private static final long serialVersionUID = -5076990764713538973L; - - private String loginIdentity = null; - - public String getLoginIdentity() { - return loginIdentity; - } - - public void setLoginIdentity(String loginIdentity) { - this.loginIdentity = loginIdentity; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/BaseAction.java deleted file mode 100644 index db9cca14c8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/BaseAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.Gson; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.service.OkrConfigSecretaryService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.entity.OkrUserInfo; - -import net.sf.ehcache.Ehcache; - -public class BaseAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger( BaseAction.class ); - protected OkrConfigSecretaryService okrConfigSecretaryService = new OkrConfigSecretaryService(); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected Ehcache cache = ApplicationCache.instance().getCache( OkrUserInfo.class); - - /** - * 设置用户登录的代理身份，记录到数据库中并且清空相应的缓存对象 - * - * @param name - * @throws Exception - */ - public OkrUserCache setUserLoginIdentity(HttpServletRequest request, EffectivePerson currentPerson, String identity)throws Exception { - Gson gson = XGsonBuilder.instance(); - String customContent = null; - Boolean isOkrSystemAdmin = false; - OkrUserCache okrUserCache = new OkrUserCache(); - okrUserCache.setLoginIdentityName(identity); - - // 查询name的第一个身份所属的组织和顶层组织 - okrUserCache.setOperationUserName( currentPerson.getDistinguishedName() ); - okrUserCache.setOperationUserUnitName( okrUserManagerService.getUnitNameWithPerson(currentPerson.getDistinguishedName())); - okrUserCache.setOperationUserTopUnitName( okrUserManagerService.getTopUnitNameWithPerson(currentPerson.getDistinguishedName())); - - // 查询identity所属的组织和顶层组织 - String personName = okrUserManagerService.getPersonNameByIdentity( identity ); - okrUserCache.setLoginUserName( personName ); - okrUserCache.setLoginUserUnitName( okrUserManagerService.getUnitNameByIdentity(identity) ); - okrUserCache.setLoginUserTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(identity) ); - try { - //查询用户是否OKR系统管理员 - if( StringUtils.isNotEmpty( okrUserCache.getLoginUserName() )) { - isOkrSystemAdmin = okrUserManagerService.isHasPlatformRole( okrUserCache.getLoginUserName(), ThisApplication.OKRMANAGER ); - }else { - isOkrSystemAdmin = okrUserManagerService.isHasPlatformRole( currentPerson.getDistinguishedName(), ThisApplication.OKRMANAGER ); - } - } catch (Exception e) { - logger.error(e, currentPerson, request, null); - } - okrUserCache.setOkrManager( isOkrSystemAdmin ); - - //将数据存储到数据库里备用 - customContent = gson.toJson( okrUserCache, OkrUserCache.class ); - - OkrUserInfo userInfo = new OkrUserInfo(); - userInfo.setUserName( currentPerson.getDistinguishedName() ); - userInfo.setCustomContent( customContent ); - okrUserInfoService.save( userInfo ); - - String cacheKey = ThisApplication.getOkrUserInfoCacheKey( currentPerson.getDistinguishedName() ); - ApplicationCache.notify( OkrUserInfo.class, cacheKey ); - return okrUserCache; - } - - /** - * 设置用户登录的代理身份 - * - * @param name - * @throws Exception - */ - public OkrUserCache setUserXadmin(HttpServletRequest request, EffectivePerson currentPerson) throws Exception { - Gson gson = XGsonBuilder.instance(); - String customContent = null; - OkrUserCache okrUserCache = new OkrUserCache(); - okrUserCache.setLoginIdentityName("xadmin"); - // 查询name的第一个身份所属的组织和顶层组织 - okrUserCache.setOperationUserName("xadmin"); - okrUserCache.setOperationUserUnitName("xadmin"); - okrUserCache.setOperationUserTopUnitName("xadmin"); - okrUserCache.setLoginUserName("xadmin"); - okrUserCache.setLoginUserUnitName("xadmin"); - okrUserCache.setLoginUserTopUnitName("xadmin"); - okrUserCache.setOkrManager(true); - - customContent = gson.toJson(okrUserCache, OkrUserCache.class); - OkrUserInfo userInfo = new OkrUserInfo(); - userInfo.setUserName("xadmin"); - userInfo.setCustomContent( customContent ); - okrUserInfoService.save(userInfo); - - String cacheKey = ThisApplication.getOkrUserInfoCacheKey( currentPerson.getDistinguishedName() ); - ApplicationCache.notify( OkrUserInfo.class, cacheKey ); - - return okrUserCache; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLoginAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLoginAction.java deleted file mode 100644 index 6a2ef95626..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLoginAction.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; - -@Path("login") -@JaxrsDescribe("工作管理系统登入服务") -public class OkrLoginAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrLoginAction.class); - - @JaxrsMethodDescribe(value = "用户进入系统，获取并且缓存用户身份信息", action = ActionLogin.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void login(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - - try { - result = new ActionLogin().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统用户登入过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "获取用户身份信息", action = ActionGetLoginUser.class) - @GET - @Path("user/get") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getLoginUserInfo(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGetLoginUser().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("获取用户身份信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLogoutAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLogoutAction.java deleted file mode 100644 index c3a48f2968..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/OkrLogoutAction.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; - -@Path("logout") -@JaxrsDescribe("工作管理系统登出服务") -public class OkrLogoutAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(ActionLogin.class); - - @JaxrsMethodDescribe(value = "用户登出，删除已经缓存的用户身份信息", action = ActionLogout.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void logout(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - - try { - result = new ActionLogout().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统用户登出过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 623a1aba8a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionOkrSystemAdminCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionOkrSystemAdminCheck.java deleted file mode 100644 index d42e5a4fd2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionOkrSystemAdminCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOkrSystemAdminCheck extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOkrSystemAdminCheck( Throwable e, String userName ) { - super("系统在判断用户是否是OKR系统管理员时发生异常.Name:" + userName, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserHasNoProxyIdentity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserHasNoProxyIdentity.java deleted file mode 100644 index 4c1dd50996..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserHasNoProxyIdentity.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserHasNoProxyIdentity extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserHasNoProxyIdentity( String userName, String proxyIdentity ) { - super("用户'" + userName +"'没有用户'"+ proxyIdentity +"'的代理身份，无法继续登录应用." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserIdentityQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserIdentityQuery.java deleted file mode 100644 index 88a81cfd5d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserIdentityQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserIdentityQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserIdentityQuery( Throwable e, String userName ) { - super("根据员工获取员工默认身份信息时发生异常.!用户:'" + userName +"'", e ); - } - - public ExceptionUserIdentityQuery( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名查询秘书配置信息时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserProxyQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserProxyQuery.java deleted file mode 100644 index 9f4d3815ec..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/login/exception/ExceptionUserProxyQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.login.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserProxyQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserProxyQuery( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名查询秘书配置信息时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/ActionListMindForCenterId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/ActionListMindForCenterId.java deleted file mode 100644 index 66c9c331e5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/ActionListMindForCenterId.java +++ /dev/null @@ -1,827 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.mind.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.mind.exception.ExceptionDeployedWorkListAll; -import com.x.okr.assemble.control.jaxrs.mind.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.mind.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.mind.exception.ExceptionViewableWorkList; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionListMindForCenterId extends BaseAction { - protected WrapCopier okrCenterSimpleInfo_wrapout_copier = WrapCopierFactory - .wo(OkrCenterWorkInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - private static Logger logger = LoggerFactory.getLogger(ActionListMindForCenterId.class); - - protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String centerId) - throws Exception { - ActionResult result = new ActionResult(); - List wrapsWorkBaseInfoList_for_center = new ArrayList<>(); - List viewWorkBaseInfoList = new ArrayList<>(); - WoOkrWorkBaseSimpleInfo wrapOutOkrWorkBaseSimpleInfo = null; - Wo center = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrUserCache okrUserCache = null; - Boolean check = true; - List myWorkIds = null; - List query_statuses = new ArrayList(); - query_statuses.add("正常"); - query_statuses.add("已归档"); - - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new ExceptionUserNoLogin(effectivePerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - - if (check) {// 查询中心工作信息是否存在 - okrCenterWorkInfo = okrCenterWorkInfoService.get(centerId); - if (okrCenterWorkInfo == null) { - check = false; - Exception exception = new ExceptionCenterWorkNotExists(effectivePerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - } - - if (check) {// 查询中心工作信息是否存在 - center = new Wo(); - center.setDefaultCompleteDateLimitStr(okrCenterWorkInfo.getDefaultCompleteDateLimitStr()); - center.setProcessStatus(okrCenterWorkInfo.getProcessStatus()); - center.setStatus(okrCenterWorkInfo.getStatus()); - center.setDefaultWorkType(okrCenterWorkInfo.getDefaultWorkType()); - center.setDescription(okrCenterWorkInfo.getDescription()); - center.setId(okrCenterWorkInfo.getId()); - center.setTitle(okrCenterWorkInfo.getTitle()); - center.setCreateTime(okrCenterWorkInfo.getCreateTime()); - center.setWatch(true); - } - - if (check) {// 获取用户可以看到的所有具体工作信息（有观察者身份的） - if (!okrUserCache.isOkrManager()) { - try { - myWorkIds = okrWorkPersonService.listDistinctWorkIdsWithMe(okrUserCache.getLoginIdentityName(), - centerId); - } catch (Exception e) { - result.error(e); - Exception exception = new ExceptionViewableWorkList(e, okrUserCache.getLoginIdentityName(), - centerId); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } else { - try { - myWorkIds = okrWorkBaseInfoService.listAllDeployedWorkIds(centerId, null); - } catch (Exception e) { - result.error(e); - Exception exception = new ExceptionDeployedWorkListAll(e, centerId); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - } - - if (check) { - if (myWorkIds != null && !myWorkIds.isEmpty()) { - for (String workId : myWorkIds) { - - if (workId != null && !workId.isEmpty()) { - okrWorkBaseInfo = okrWorkBaseInfoService.get(workId); - wrapOutOkrWorkBaseSimpleInfo = new WoOkrWorkBaseSimpleInfo(); - wrapOutOkrWorkBaseSimpleInfo.setWatch(true); - composeWorkInfo(okrWorkBaseInfo, wrapOutOkrWorkBaseSimpleInfo); - if (!workContain(wrapOutOkrWorkBaseSimpleInfo, viewWorkBaseInfoList)) { - viewWorkBaseInfoList.add(wrapOutOkrWorkBaseSimpleInfo); - } - composeParentWork(okrWorkBaseInfo, viewWorkBaseInfoList, myWorkIds); - } - } - } - } - - if (check) { - for (WoOkrWorkBaseSimpleInfo wrap_work : viewWorkBaseInfoList) { - // 判断工作是否有未提交的工作汇报 - // hasNoneSubmitReport = false; - // hasNoneSubmitReport = - // okrWorkBaseInfoService.hasNoneSubmitReport( - // wrap_work.getId(), "草稿", "草稿", null ); - // wrap_work.setHasNoneSubmitReport( hasNoneSubmitReport ); - if (wrap_work.getParentId() == null || wrap_work.getParentId().isEmpty()) { - wrap_work = composeSubWork(viewWorkBaseInfoList, wrap_work); - wrapsWorkBaseInfoList_for_center.add(wrap_work); - } - } - if (wrapsWorkBaseInfoList_for_center != null && !wrapsWorkBaseInfoList_for_center.isEmpty()) { - try { - SortTools.asc(wrapsWorkBaseInfoList_for_center, "completeDateLimitStr"); - } catch (Exception e) { - result.error(e); - logger.error(e, effectivePerson, request, null); - } - } - if (center != null) { - center.setWorks(wrapsWorkBaseInfoList_for_center); - - } - } - result.setData(center); - return result; - } - - private void composeParentWork(OkrWorkBaseInfo okrWorkBaseInfo, List viewWorkBaseInfoList, - List myWorkIds) throws Exception { - if (okrWorkBaseInfo == null) { - return; - } - if (myWorkIds == null) { - return; - } - if (viewWorkBaseInfoList == null) { - viewWorkBaseInfoList = new ArrayList(); - } - if (okrWorkBaseInfo.getParentWorkId() != null && !okrWorkBaseInfo.getParentWorkId().isEmpty() - && !okrWorkBaseInfo.getId().equalsIgnoreCase(okrWorkBaseInfo.getParentWorkId())) { - OkrWorkBaseInfo parentWork = null; - WoOkrWorkBaseSimpleInfo wrapOutOkrWorkBaseSimpleInfo = null; - parentWork = okrWorkBaseInfoService.get(okrWorkBaseInfo.getParentWorkId()); - if (parentWork != null) { - wrapOutOkrWorkBaseSimpleInfo = new WoOkrWorkBaseSimpleInfo(); - composeWorkInfo(parentWork, wrapOutOkrWorkBaseSimpleInfo); - for (String id : myWorkIds) { - if (id != null && !id.isEmpty()) { - if (parentWork.getId().equalsIgnoreCase(id)) { - // 是用户自己可以查看的工作, 用户可以点击开 - wrapOutOkrWorkBaseSimpleInfo.setWatch(true); - } - } - } - - composeParentWork(parentWork, viewWorkBaseInfoList, myWorkIds); - - if (!workContain(wrapOutOkrWorkBaseSimpleInfo, viewWorkBaseInfoList)) { - viewWorkBaseInfoList.add(wrapOutOkrWorkBaseSimpleInfo); - } - } - } - } - - private void composeWorkInfo(OkrWorkBaseInfo work, WoOkrWorkBaseSimpleInfo wrapOutOkrWorkBaseSimpleInfo) { - if (work == null) { - return; - } - if (wrapOutOkrWorkBaseSimpleInfo == null) { - return; - } - wrapOutOkrWorkBaseSimpleInfo.setId(work.getId()); - wrapOutOkrWorkBaseSimpleInfo.setTitle(work.getTitle()); - wrapOutOkrWorkBaseSimpleInfo.setWorkProcessStatus(work.getWorkProcessStatus()); - wrapOutOkrWorkBaseSimpleInfo.setParentId(work.getParentWorkId()); - wrapOutOkrWorkBaseSimpleInfo.setIsOverTime(work.getIsOverTime()); - wrapOutOkrWorkBaseSimpleInfo.setIsCompleted(work.getIsCompleted()); - wrapOutOkrWorkBaseSimpleInfo.setOverallProgress(work.getOverallProgress()); - wrapOutOkrWorkBaseSimpleInfo.setWorkType(work.getWorkType()); - wrapOutOkrWorkBaseSimpleInfo.setCompleteDateLimitStr(work.getCompleteDateLimitStr()); - wrapOutOkrWorkBaseSimpleInfo.setResponsibilityUnitName(work.getResponsibilityUnitName()); - wrapOutOkrWorkBaseSimpleInfo.setResponsibilityIdentity(work.getResponsibilityIdentity()); - wrapOutOkrWorkBaseSimpleInfo.setResponsibilityEmployeeName(work.getResponsibilityEmployeeName()); - wrapOutOkrWorkBaseSimpleInfo.setCooperateUnitNameList(work.getCooperateUnitNameList()); - wrapOutOkrWorkBaseSimpleInfo.setCooperateEmployeeNameList(work.getCooperateEmployeeNameList()); - wrapOutOkrWorkBaseSimpleInfo.setCooperateIdentityList(work.getCooperateIdentityList()); - } - - private Boolean workContain(WoOkrWorkBaseSimpleInfo wrapOutOkrWorkBaseSimpleInfo, - List viewWorkBaseInfoList) { - if (wrapOutOkrWorkBaseSimpleInfo == null) { - return true; - } - if (viewWorkBaseInfoList == null) { - viewWorkBaseInfoList = new ArrayList(); - return false; - } - for (WoOkrWorkBaseSimpleInfo info : viewWorkBaseInfoList) { - if (info.getId().equalsIgnoreCase(wrapOutOkrWorkBaseSimpleInfo.getId())) { - return true; - } - } - return false; - } - - private WoOkrWorkBaseSimpleInfo composeSubWork(List viewWorkBaseInfoList, - WoOkrWorkBaseSimpleInfo wrap_work) { - if (viewWorkBaseInfoList != null && !viewWorkBaseInfoList.isEmpty()) { - for (WoOkrWorkBaseSimpleInfo work : viewWorkBaseInfoList) { - if (work.getParentId() != null && !work.getParentId().isEmpty() - && work.getParentId().equalsIgnoreCase(wrap_work.getId())) { - // 说明该工作是wrap_work的下级工作 - work = composeSubWork(viewWorkBaseInfoList, work); - wrap_work.addNewSubWorkBaseInfo(work); - } - } - } - return wrap_work; - } - - public static class Wo { - - @FieldDescribe("中心工作ID") - private String id = null; - - @FieldDescribe("中心标题") - private String title = null; - - @FieldDescribe("部署者姓名") - private String deployerName = null; - - @FieldDescribe("部署者身份") - private String deployerIdentity = null; - - @FieldDescribe("部署者所属组织") - private String deployerUnitName = null; - - @FieldDescribe("部署者所属顶层组织") - private String deployerTopUnitName = null; - - @FieldDescribe("审核者姓名") - private String auditLeaderName = null; - - @FieldDescribe("审核者身份") - private String auditLeaderIdentity = null; - - @FieldDescribe("中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消") - private String processStatus = "草稿"; - - @FieldDescribe("中心工作默认完成日期-字符串，显示用：yyyy-mm-dd") - private String defaultCompleteDateLimitStr = null; - - @FieldDescribe("中心工作默认工作类别") - private String defaultWorkType = null; - - @FieldDescribe("中心工作默认工作级别") - private String defaultWorkLevel = null; - - @FieldDescribe("中心工作默认阅知领导(可多值，显示用)") - private String defaultLeader = null; - - @FieldDescribe("中心工作默认阅知领导身份(可多值，计算组织和顶层组织用)") - private String defaultLeaderIdentity = null; - - @FieldDescribe("工作汇报审批领导(可多值，显示用)") - private String reportAuditLeaderName = null; - - @FieldDescribe("工作汇报审批领导身份(可多值，计算组织和顶层组织用)") - private String reportAuditLeaderIdentity = null; - - @FieldDescribe("中心工作是否需要审核") - private Boolean isNeedAudit = false; - - @FieldDescribe("处理状态：正常|已删除") - private String status = "正常"; - - @FieldDescribe("中心工作描述") - private String description = null; - - @FieldDescribe("中心工作创建时间") - private Date createTime = null; - - @FieldDescribe("中心工作包括的工作列表") - private List works = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getAuditLeaderName() { - return auditLeaderName; - } - - public void setAuditLeaderName(String auditLeaderName) { - this.auditLeaderName = auditLeaderName; - } - - public String getAuditLeaderIdentity() { - return auditLeaderIdentity; - } - - public void setAuditLeaderIdentity(String auditLeaderIdentity) { - this.auditLeaderIdentity = auditLeaderIdentity; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - public String getDefaultLeader() { - return defaultLeader; - } - - public void setDefaultLeader(String defaultLeader) { - this.defaultLeader = defaultLeader; - } - - public String getDefaultLeaderIdentity() { - return defaultLeaderIdentity; - } - - public void setDefaultLeaderIdentity(String defaultLeaderIdentity) { - this.defaultLeaderIdentity = defaultLeaderIdentity; - } - - public String getReportAuditLeaderName() { - return reportAuditLeaderName; - } - - public void setReportAuditLeaderName(String reportAuditLeaderName) { - this.reportAuditLeaderName = reportAuditLeaderName; - } - - public String getReportAuditLeaderIdentity() { - return reportAuditLeaderIdentity; - } - - public void setReportAuditLeaderIdentity(String reportAuditLeaderIdentity) { - this.reportAuditLeaderIdentity = reportAuditLeaderIdentity; - } - - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public List getWorks() { - return works; - } - - public void setWorks(List works) { - this.works = works; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - } - - public static class WoOkrWorkBaseSimpleInfo { - - public static List Excludes = new ArrayList(); - - @FieldDescribe("子工作信息列表") - private List subWorks = null; - - @FieldDescribe("工作ID") - private String id = null; - - @FieldDescribe("上级工作ID") - private String parentId = null; - - @FieldDescribe("工作标题") - private String title = null; - - @FieldDescribe("中心工作ID") - private String centerId = null; - - @FieldDescribe("中心工作标题") - private String centerTitle = null; - - @FieldDescribe("主责人姓名") - private String responsibilityEmployeeName = null; - - @FieldDescribe("主责人身份") - private String responsibilityIdentity = null; - - @FieldDescribe("主责人所属组织") - private String responsibilityUnitName = null; - - @FieldDescribe("主责人所属顶层组织") - private String responsibilityTopUnitName = null; - - @FieldDescribe("协助人姓名") - private List cooperateEmployeeNameList = null; - - @FieldDescribe("协助人所属组织") - private List cooperateUnitNameList = null; - - @FieldDescribe("协助人身份") - private List cooperateIdentityList = null; - - @FieldDescribe("工作类别") - private String workType = null; - - @FieldDescribe("工作级别") - private String workLevel = null; - - @FieldDescribe("工作进度") - private Integer overallProgress = 0; - - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - private String workProcessStatus = "草稿"; - - @FieldDescribe("工作是否已超期") - private Boolean isOverTime = false; - - @FieldDescribe("工作是否已完成") - private Boolean isCompleted = false; - - @FieldDescribe("工作详细描述, 事项分解") - private String workDetail = null; - - @FieldDescribe("职责描述") - private String dutyDescription = null; - - @FieldDescribe("里程碑标志说明") - private String landmarkDescription = null; - - @FieldDescribe("重点事项说明") - private String majorIssuesDescription = null; - - @FieldDescribe("具体行动举措") - private String progressAction = null; - - @FieldDescribe("进展计划时限说明") - private String progressPlan = null; - - @FieldDescribe("交付成果说明") - private String resultDescription = null; - - @FieldDescribe("是否可以查看工作详情") - private Boolean watch = false; - - private String completeDateLimitStr = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCenterId() { - return centerId; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public List getSubWorks() { - return subWorks; - } - - public void setSubWorks(List subWorks) { - this.subWorks = subWorks; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public String getWorkProcessStatus() { - return workProcessStatus; - } - - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - public Boolean getIsOverTime() { - return isOverTime; - } - - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - public Boolean getIsCompleted() { - return isCompleted; - } - - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseSimpleInfo work) { - if (subWorks == null) { - subWorks = new ArrayList(); - } - subWorks.add(work); - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public List getCooperateEmployeeNameList() { - return cooperateEmployeeNameList; - } - - public List getCooperateUnitNameList() { - return cooperateUnitNameList; - } - - public List getCooperateIdentityList() { - return cooperateIdentityList; - } - - public void setCooperateEmployeeNameList(List cooperateEmployeeNameList) { - this.cooperateEmployeeNameList = cooperateEmployeeNameList; - } - - public void setCooperateUnitNameList(List cooperateUnitNameList) { - this.cooperateUnitNameList = cooperateUnitNameList; - } - - public void setCooperateIdentityList(List cooperateIdentityList) { - this.cooperateIdentityList = cooperateIdentityList; - } - - public Integer getOverallProgress() { - return overallProgress; - } - - public void setOverallProgress(Integer overallProgress) { - this.overallProgress = overallProgress; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/BaseAction.java deleted file mode 100644 index 6f879dc7ba..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/BaseAction.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; - -public class BaseAction extends StandardJaxrsAction { - protected OkrCenterWorkQueryService okrCenterWorkInfoService = new OkrCenterWorkQueryService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/OkrWorkMindAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/OkrWorkMindAction.java deleted file mode 100644 index 67fff23218..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/OkrWorkMindAction.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -/** - * 具体工作项有短期工作还长期工作，短期工作不需要自动启动定期汇报，由人工撰稿汇报即可 - */ - -@Path("mind") -@JaxrsDescribe("工作信息脑图展现服务") -public class OkrWorkMindAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkMindAction.class); - - /** - * 展示与用户可视的工作有关联的工作部署线（可配置为全部显示） 用户可视的工作，可以被访问详情 - * - * @param request - * @param centerId - * @return - */ - @JaxrsMethodDescribe(value = "根据中心工作ID获取用户需要在脑图里展现的所有工作信息列表", action = ActionListMindForCenterId.class) - @GET - @Path("center/{centerId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMindWorkByCenterId(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("centerId") String centerId) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionListMindForCenterId().execute(request, effectivePerson, centerId); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionCenterWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionCenterWorkNotExists.java deleted file mode 100644 index e6a0592c6e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionCenterWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkNotExists( String id ) { - super("指定ID的中心工作不存在!ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionDeployedWorkListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionDeployedWorkListAll.java deleted file mode 100644 index a1c21a34da..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionDeployedWorkListAll.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionDeployedWorkListAll extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionDeployedWorkListAll( Throwable e, String centerId ) { - super("获取所有已经部署的具体工作信息发生异常!CenterId:" + centerId ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index c05a58f4fc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 372fc88e79..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionViewableWorkList.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionViewableWorkList.java deleted file mode 100644 index 7119706856..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/mind/exception/ExceptionViewableWorkList.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.mind.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionViewableWorkList extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionViewableWorkList( Throwable e, String name, String centerId ) { - super("获取用户可以看到的所有具体工作信息发生异常!Name:" + name + ", CenterId:" + centerId ); - } - - public ExceptionViewableWorkList( Throwable e, String name ) { - super("获取用户可以看到的所有具体工作信息发生异常!Name:" + name ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownload.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownload.java deleted file mode 100644 index 72cce63f69..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownload.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionCenterAttachmentDownload extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = okrAttachmentFileInfoService.get(id); - - if ( null == attachment ) { - throw new Exception("附件不存在。id:" + id ) ; - }else { - StorageMapping mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage()); - Wo wo = new Wo(attachment.readContent(mapping), - this.contentType(false, attachment.getName()), - this.contentDisposition(false, attachment.getName())); - result.setData(wo); - } - return result; - } - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownloadStream.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownloadStream.java deleted file mode 100644 index 80f2786ae2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentDownloadStream.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionCenterAttachmentDownloadStream extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Boolean stream ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = okrAttachmentFileInfoService.get(id); - - if ( null == attachment ) { - throw new Exception("附件不存在。id:" + id ) ; - }else { - StorageMapping mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage()); - Wo wo = new Wo(attachment.readContent(mapping), - this.contentType(stream, attachment.getName()), - this.contentDisposition(stream, attachment.getName())); - result.setData(wo); - } - return result; - } - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentUpload.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentUpload.java deleted file mode 100644 index 89c8b306ed..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionCenterAttachmentUpload.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.Date; -import java.util.UUID; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.glassfish.jersey.media.multipart.FormDataContentDisposition; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.DefaultCharset; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionEmptyExtension; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.URLParameterGetException; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionCenterAttachmentUpload extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionCenterAttachmentUpload.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, - String centerId, String site, byte[] bytes, FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = null; - OkrCenterWorkInfo center = null; - StorageMapping mapping = null; - String fileName = null; - Boolean check = true; - - if( check ){ - if( StringUtils.isEmpty(centerId) ){ - check = false; - Exception exception = new URLParameterGetException( new Exception("未获取到中心工作ID") ); - result.error( exception ); - } - } - - if( check ){//判断工作信息是否已经存在 - try { - center = okrCenterWorkInfoService.get( centerId ); - if (null == center) { - check = false; - Exception exception = new ExceptionCenterWorkNotExists( centerId ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - logger.error( e, effectivePerson, request, null ); - } - } - - if( check ){ - try { - fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name)); - /** 禁止不带扩展名的文件上传 */ - if (StringUtils.isEmpty(fileName)) { - check = false; - Exception exception = new ExceptionEmptyExtension( fileName ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - } - } - - if( check ){ - try { - mapping = ThisApplication.context().storageMappings().random( OkrAttachmentFileInfo.class ); - } catch (Exception e) { - check = false; - result.error( e ); - logger.warn( "系统在获取存储的时候发生异常！" ); - logger.error( e, effectivePerson, request, null ); - } - } - - if( check ){ - try { - attachment = this.concreteAttachment( mapping, center, fileName, effectivePerson, site ); - attachment.saveContent(mapping, bytes, fileName); - attachment = okrCenterWorkInfoService.saveAttachment( centerId, attachment ); - Wo wo = new Wo(); - wo.setId( attachment.getId() ); - result.setData(wo); - } catch (Exception e) { - check = false; - result.error( e ); - logger.warn( "系统在保存文件和更新数据时候发生异常！" ); - logger.error( e, effectivePerson, request, null ); - } - } - return result; - } - - private OkrAttachmentFileInfo concreteAttachment(StorageMapping mapping, OkrCenterWorkInfo center, String name, EffectivePerson effectivePerson, String site) throws Exception { - OkrAttachmentFileInfo attachment = new OkrAttachmentFileInfo(); - String fileName = UUID.randomUUID().toString(); - String extension = FilenameUtils.getExtension( name ); - if ( StringUtils.isNotEmpty(extension)) { - fileName = fileName + "." + extension; - }else{ - throw new Exception("file extension is empty."); - } - if( name.indexOf( "\\" ) >0 ){ - name = StringUtils.substringAfterLast( name, "\\"); - } - if( name.indexOf( "/" ) >0 ){ - name = StringUtils.substringAfterLast( name, "/"); - } - attachment.setCreateTime( new Date() ); - attachment.setLastUpdateTime( new Date() ); - attachment.setExtension( extension ); - attachment.setName( name ); - attachment.setFileName( fileName ); - attachment.setStorage( mapping.getName() ); - attachment.setWorkInfoId(""); - attachment.setCenterId( center.getId() ); - attachment.setStatus( "正常" ); - attachment.setParentType( "工作" ); - attachment.setCreatorUid( effectivePerson.getDistinguishedName() ); - attachment.setSite( site ); - attachment.setFileHost( "" ); - attachment.setFilePath( "" ); - attachment.setKey( center.getId() ); - return attachment; - } - - public static class Wo extends WoId { - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteCenterAttachment.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteCenterAttachment.java deleted file mode 100644 index bf494920c7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteCenterAttachment.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentDelete; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentNotExists; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentQueryById; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionDeleteCenterAttachment extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDeleteCenterAttachment.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo okrAttachmentFileInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - StorageMapping mapping = null; - boolean hasDeletePermission = false; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionAttachmentIdEmpty(); - result.error( exception ); - } - if( check ){ - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrAttachmentFileInfo = emc.find( id, OkrAttachmentFileInfo.class ); - if (null == okrAttachmentFileInfo) { - check = false; - Exception exception = new ExceptionAttachmentNotExists( id ); - result.error( exception ); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionAttachmentQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkInfo = emc.find( okrAttachmentFileInfo.getKey(), OkrCenterWorkInfo.class ); - if ( null == okrCenterWorkInfo ) { - hasDeletePermission = true; - logger.warn( "okrCenterWorkInfo{id:" + okrAttachmentFileInfo.getKey() + "} is not exists, anyone can delete the attachments." ); - }else{ - //根据工作信息查询工作信息的干系人信息，判断是否有权限删除附件信息。 - //判断是否有权限删除附件 - if( !okrCenterWorkInfo.getDeployerName().equalsIgnoreCase( okrUserCache.getLoginUserName())){ - hasDeletePermission = false; - }else{ - hasDeletePermission = true; - } - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, okrAttachmentFileInfo.getKey() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( hasDeletePermission ){ - if( okrAttachmentFileInfo != null ){ - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, okrAttachmentFileInfo.getStorage()); - okrAttachmentFileInfo.deleteContent( mapping ); - okrAttachmentFileInfo = emc.find( id, OkrAttachmentFileInfo.class ); - okrCenterWorkInfo = emc.find( okrAttachmentFileInfo.getKey(), OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrCenterWorkInfo.class); - if( okrCenterWorkInfo != null && okrCenterWorkInfo.getAttachmentList() != null ){ - okrCenterWorkInfo.getAttachmentList().remove( okrAttachmentFileInfo.getId() ); - emc.check( okrCenterWorkInfo, CheckPersistType.all ); - } - emc.remove( okrAttachmentFileInfo, CheckRemoveType.all ); - emc.commit(); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - }catch(Exception e){ - check = false; - Exception exception = new ExceptionAttachmentDelete( e, okrAttachmentFileInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - }else{ - Exception exception = new ExceptionInsufficientPermissions( effectivePerson.getDistinguishedName(), okrAttachmentFileInfo.getId() ); - result.error( exception ); - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteReportAttachment.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteReportAttachment.java deleted file mode 100644 index b7eb1f8476..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteReportAttachment.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentDelete; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentNotExists; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentQueryById; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionDeleteReportAttachment extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDeleteReportAttachment.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo okrAttachmentFileInfo = null; - OkrWorkReportBaseInfo workReportBaseInfo = null; - StorageMapping mapping = null; - boolean hasDeletePermission = false; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionAttachmentIdEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrAttachmentFileInfo = emc.find( id, OkrAttachmentFileInfo.class ); - if (null == okrAttachmentFileInfo) { - check = false; - Exception exception = new ExceptionAttachmentNotExists( id ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionAttachmentQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - workReportBaseInfo = emc.find( okrAttachmentFileInfo.getKey(), OkrWorkReportBaseInfo.class ); - if ( null == workReportBaseInfo ) { - hasDeletePermission = true; - logger.warn( "workReportBaseInfo{id:" + okrAttachmentFileInfo.getKey() + "} is not exists, anyone can delete the attachments." ); - }else{ - //根据工作信息查询工作信息的干系人信息，判断是否有权限删除附件信息。判断是否有权限删除附件 - if( !workReportBaseInfo.getCreatorName().equalsIgnoreCase( okrUserCache.getLoginUserName())){ - hasDeletePermission = false; - }else{ - hasDeletePermission = true; - } - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, okrAttachmentFileInfo.getKey() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( hasDeletePermission ){ - if( okrAttachmentFileInfo != null ){ - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, okrAttachmentFileInfo.getStorage()); - //对文件进行删除 - okrAttachmentFileInfo.deleteContent( mapping ); - //对数据库记录进行删除 - okrAttachmentFileInfo = emc.find( id, OkrAttachmentFileInfo.class ); - workReportBaseInfo = emc.find( okrAttachmentFileInfo.getKey(), OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class); - if( workReportBaseInfo != null && workReportBaseInfo.getAttachmentList() != null ){ - workReportBaseInfo.getAttachmentList().remove( okrAttachmentFileInfo.getId() ); - emc.check( workReportBaseInfo, CheckPersistType.all ); - } - emc.remove( okrAttachmentFileInfo, CheckRemoveType.all ); - emc.commit(); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - }catch(Exception e){ - check = false; - Exception exception = new ExceptionAttachmentDelete( e, okrAttachmentFileInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - }else{ - Exception exception = new ExceptionInsufficientPermissions( effectivePerson.getDistinguishedName(), okrAttachmentFileInfo.getId() ); - result.error( exception ); - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteWorkAttachment.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteWorkAttachment.java deleted file mode 100644 index 6fe53af58c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionDeleteWorkAttachment.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentDelete; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentNotExists; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentQueryById; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionWorkQueryById; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionDeleteWorkAttachment extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDeleteWorkAttachment.class); - - protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String id) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo okrAttachmentFileInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - StorageMapping mapping = null; - boolean hasDeletePermission = false; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - } catch (Exception e1) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e1, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new ExceptionUserNoLogin(effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - if (id == null || id.isEmpty()) { - check = false; - Exception exception = new ExceptionAttachmentIdEmpty(); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - if (check) { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrAttachmentFileInfo = emc.find(id, OkrAttachmentFileInfo.class); - if (null == okrAttachmentFileInfo) { - check = false; - Exception exception = new ExceptionAttachmentNotExists(id); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionAttachmentQueryById(e, id); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - } - if (check) { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkBaseInfo = emc.find(okrAttachmentFileInfo.getKey(), OkrWorkBaseInfo.class); - if (null == okrWorkBaseInfo) { - hasDeletePermission = true; - logger.warn("okrWorkBaseInfo{id:" + okrAttachmentFileInfo.getKey() - + "} is not exists, anyone can delete the attachments."); - } else { - // 根据工作信息查询工作信息的干系人信息，判断是否有权限删除附件信息。 - // 判断是否有权限删除附件 - if (!okrWorkBaseInfo.getDeployerName().equalsIgnoreCase(okrUserCache.getLoginUserName())) { - hasDeletePermission = false; - } else { - hasDeletePermission = true; - } - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById(e, okrAttachmentFileInfo.getKey()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - } - if (check) { - if (hasDeletePermission) { - if (okrAttachmentFileInfo != null) { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, - okrAttachmentFileInfo.getStorage()); - // 对文件进行删除 - okrAttachmentFileInfo.deleteContent(mapping); - // 对数据库记录进行删除 - okrAttachmentFileInfo = emc.find(id, OkrAttachmentFileInfo.class); - okrWorkBaseInfo = emc.find(okrAttachmentFileInfo.getWorkInfoId(), OkrWorkBaseInfo.class); - emc.beginTransaction(OkrAttachmentFileInfo.class); - emc.beginTransaction(OkrWorkBaseInfo.class); - if (okrWorkBaseInfo != null && okrWorkBaseInfo.getAttachmentList() != null) { - okrWorkBaseInfo.getAttachmentList().remove(okrAttachmentFileInfo.getId()); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - } - emc.remove(okrAttachmentFileInfo, CheckRemoveType.all); - emc.commit(); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionAttachmentDelete(e, okrAttachmentFileInfo.getId()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - } - } else { - Exception exception = new ExceptionInsufficientPermissions(effectivePerson.getDistinguishedName(), - okrAttachmentFileInfo.getId()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionGet.java deleted file mode 100644 index 92af4cbf5a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionGet.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentNotExists; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentQueryById; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrAttachmentFileInfo okrAttachmentFileInfo = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionAttachmentIdEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - }else{ - try { - okrAttachmentFileInfo = okrAttachmentFileInfoService.get( id ); - if( okrAttachmentFileInfo != null ){ - wrap = Wo.copier.copy( okrAttachmentFileInfo ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionAttachmentNotExists( id ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch ( Exception e ) { - Exception exception = new ExceptionAttachmentQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrAttachmentFileInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrAttachmentFileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithCenterId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithCenterId.java deleted file mode 100644 index 3f32a271db..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithCenterId.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionListWithCenterId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithCenterId.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult>(); - List wrapOutOkrAttachmentFileInfoList = null; - List fileInfoList = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error( exception ); - }else{ - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get( id ); - if( okrCenterWorkInfo != null ){ - if( okrCenterWorkInfo.getAttachmentList() != null && okrCenterWorkInfo.getAttachmentList().size() > 0 ){ - fileInfoList = okrAttachmentFileInfoService.list( okrCenterWorkInfo.getAttachmentList() ); - }else{ - fileInfoList = new ArrayList(); - } - wrapOutOkrAttachmentFileInfoList = Wo.copier.copy( fileInfoList ); - } - } catch (Exception e) { - Exception exception = new ExceptionCenterWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( wrapOutOkrAttachmentFileInfoList == null ){ - wrapOutOkrAttachmentFileInfoList = new ArrayList(); - } - result.setData( wrapOutOkrAttachmentFileInfoList ); - } - return result; - } - - public static class Wo extends OkrAttachmentFileInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrAttachmentFileInfo.class, Wo.class, null,JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithReportId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithReportId.java deleted file mode 100644 index 816665a971..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithReportId.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionListWithReportId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithReportId.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult>(); - List wrapOutOkrAttachmentFileInfoList = null; - List fileInfoList = null; - OkrWorkReportBaseInfo workReportBaseInfo = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error( exception ); - } - try { - workReportBaseInfo = okrWorkReportQueryService.get( id ); - if( workReportBaseInfo != null ){ - if( workReportBaseInfo.getAttachmentList() != null && workReportBaseInfo.getAttachmentList().size() > 0 ){ - fileInfoList = okrAttachmentFileInfoService.list( workReportBaseInfo.getAttachmentList() ); - }else{ - fileInfoList = new ArrayList(); - } - wrapOutOkrAttachmentFileInfoList = Wo.copier.copy( fileInfoList ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkReportQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( wrapOutOkrAttachmentFileInfoList == null ){ - wrapOutOkrAttachmentFileInfoList = new ArrayList(); - } - result.setData( wrapOutOkrAttachmentFileInfoList ); - return result; - } - - public static class Wo extends OkrAttachmentFileInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrAttachmentFileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithWorkId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithWorkId.java deleted file mode 100644 index 451f0e06e7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionListWithWorkId.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentListByIds; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionAttachmentWrapOut; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionWorkQueryById; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionListWithWorkId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithWorkId.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult>(); - List wrapOutOkrAttachmentFileInfoList = null; - List fileInfoList = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionAttachmentIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - } catch ( Exception e ) { - Exception exception = new ExceptionWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( okrWorkBaseInfo != null ){ - if( okrWorkBaseInfo.getAttachmentList() != null && okrWorkBaseInfo.getAttachmentList().size() > 0 ){ - try { - fileInfoList = okrAttachmentFileInfoService.list( okrWorkBaseInfo.getAttachmentList() ); - } catch ( Exception e ) { - Exception exception = new ExceptionAttachmentListByIds( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - fileInfoList = new ArrayList(); - } - if( fileInfoList != null && !fileInfoList.isEmpty() ){ - try { - wrapOutOkrAttachmentFileInfoList = Wo.copier.copy( fileInfoList ); - } catch ( Exception e ) { - Exception exception = new ExceptionAttachmentWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if( wrapOutOkrAttachmentFileInfoList == null ){ - wrapOutOkrAttachmentFileInfoList = new ArrayList(); - } - result.setData( wrapOutOkrAttachmentFileInfoList ); - } - return result; - } - - public static class Wo extends OkrAttachmentFileInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrAttachmentFileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownload.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownload.java deleted file mode 100644 index 5d13a52a6b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownload.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionReportAttachmentDownload extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = okrAttachmentFileInfoService.get(id); - - if ( null == attachment ) { - throw new Exception("附件不存在。id:" + id ) ; - }else { - StorageMapping mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage()); - Wo wo = new Wo(attachment.readContent(mapping), - this.contentType(false, attachment.getName()), - this.contentDisposition(false, attachment.getName())); - result.setData(wo); - } - return result; - } - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownloadStream.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownloadStream.java deleted file mode 100644 index 4b16f144c6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentDownloadStream.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionReportAttachmentDownloadStream extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Boolean stream ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = okrAttachmentFileInfoService.get(id); - - if ( null == attachment ) { - throw new Exception("附件不存在。id:" + id ) ; - }else { - StorageMapping mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage()); - Wo wo = new Wo(attachment.readContent(mapping), - this.contentType(stream, attachment.getName()), - this.contentDisposition(stream, attachment.getName())); - result.setData(wo); - } - return result; - } - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentUpload.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentUpload.java deleted file mode 100644 index 13a53c1645..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionReportAttachmentUpload.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.Date; -import java.util.UUID; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.glassfish.jersey.media.multipart.FormDataContentDisposition; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.DefaultCharset; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionEmptyExtension; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.URLParameterGetException; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.WorkReportNotExistsException; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionReportAttachmentUpload extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionReportAttachmentUpload.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, - String reportId, String site, byte[] bytes, FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = null; - OkrWorkReportBaseInfo report = null; - StorageMapping mapping = null; - String fileName = null; - Boolean check = true; - - if( check ){ - if( StringUtils.isEmpty(reportId) ){ - check = false; - Exception exception = new URLParameterGetException( new Exception("未获取到汇报ID") ); - result.error( exception ); - } - } - - if( check ){//判断汇报是否已经存在 - try { - report = okrWorkReportQueryService.get( reportId ); - if (null == report) { - check = false; - Exception exception = new WorkReportNotExistsException( reportId ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - logger.error( e, effectivePerson, request, null ); - } - } - - if( check ){ - try { - fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name)); - /** 禁止不带扩展名的文件上传 */ - if (StringUtils.isEmpty(fileName)) { - check = false; - Exception exception = new ExceptionEmptyExtension( fileName ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - } - } - - if( check ){ - try { - mapping = ThisApplication.context().storageMappings().random( OkrAttachmentFileInfo.class ); - } catch (Exception e) { - check = false; - result.error( e ); - logger.warn( "系统在获取存储的时候发生异常！" ); - logger.error( e, effectivePerson, request, null ); - } - } - - if( check ){ - try { - attachment = this.concreteAttachment( mapping, report, fileName, effectivePerson, site ); - attachment.saveContent(mapping, bytes, fileName); - attachment = okrWorkReportOperationService.saveAttachment( reportId, attachment ); - Wo wo = new Wo(); - wo.setId( attachment.getId() ); - result.setData(wo); - } catch (Exception e) { - check = false; - result.error( e ); - logger.warn( "系统在保存文件和更新数据时候发生异常！" ); - logger.error( e, effectivePerson, request, null ); - } - } - return result; - } - - private OkrAttachmentFileInfo concreteAttachment(StorageMapping mapping, OkrWorkReportBaseInfo report, String name, EffectivePerson effectivePerson, String site) throws Exception { - OkrAttachmentFileInfo attachment = new OkrAttachmentFileInfo(); - String fileName = UUID.randomUUID().toString(); - String extension = FilenameUtils.getExtension( name ); - if ( StringUtils.isNotEmpty(extension)) { - fileName = fileName + "." + extension; - }else{ - throw new Exception("file extension is empty."); - } - if( name.indexOf( "\\" ) >0 ){ - name = StringUtils.substringAfterLast( name, "\\"); - } - if( name.indexOf( "/" ) >0 ){ - name = StringUtils.substringAfterLast( name, "/"); - } - attachment.setCreateTime( new Date() ); - attachment.setLastUpdateTime( new Date() ); - attachment.setExtension( extension ); - attachment.setName( name ); - attachment.setFileName( fileName ); - attachment.setStorage( mapping.getName() ); - attachment.setWorkInfoId( report.getWorkId() ); - attachment.setCenterId( report.getCenterId() ); - attachment.setStatus( "正常" ); - attachment.setParentType( "中心工作" ); - attachment.setCreatorUid( effectivePerson.getDistinguishedName() ); - attachment.setSite( site ); - attachment.setFileHost( "" ); - attachment.setFilePath( "" ); - attachment.setKey( report.getId() ); - return attachment; - } - - public static class Wo extends WoId { - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownload.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownload.java deleted file mode 100644 index 5d954f50ca..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownload.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionWorkAttachmentDownload extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = okrAttachmentFileInfoService.get(id); - - if ( null == attachment ) { - throw new Exception("附件不存在。id:" + id ) ; - }else { - StorageMapping mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage()); - Wo wo = new Wo(attachment.readContent(mapping), - this.contentType(false, attachment.getName()), - this.contentDisposition(false, attachment.getName())); - result.setData(wo); - } - return result; - } - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownloadStream.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownloadStream.java deleted file mode 100644 index c4bec6ecf7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentDownloadStream.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; - -public class ActionWorkAttachmentDownloadStream extends BaseAction { - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Boolean stream ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = okrAttachmentFileInfoService.get(id); - - if ( null == attachment ) { - throw new Exception("附件不存在。id:" + id ) ; - }else { - StorageMapping mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage()); - Wo wo = new Wo(attachment.readContent(mapping), - this.contentType(stream, attachment.getName()), - this.contentDisposition(stream, attachment.getName())); - result.setData(wo); - } - return result; - } - - public static class Wo extends WoFile { - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentUpload.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentUpload.java deleted file mode 100644 index d85285b49e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/ActionWorkAttachmentUpload.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.Date; -import java.util.UUID; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.glassfish.jersey.media.multipart.FormDataContentDisposition; - -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.DefaultCharset; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionEmptyExtension; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.URLParameterGetException; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionWorkAttachmentUpload extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionWorkAttachmentUpload.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, - String workId, String site, byte[] bytes, FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - OkrAttachmentFileInfo attachment = null; - OkrWorkBaseInfo work = null; - StorageMapping mapping = null; - String fileName = null; - Boolean check = true; - - if( check ){ - if( StringUtils.isEmpty(workId) ){ - check = false; - Exception exception = new URLParameterGetException( new Exception("未获取到汇报ID") ); - result.error( exception ); - } - } - - if( check ){//判断工作信息是否已经存在 - try { - work = okrWorkBaseInfoService.get( workId ); - if (null == work) { - check = false; - Exception exception = new ExceptionWorkNotExists( workId ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - logger.error( e, effectivePerson, request, null ); - } - } - - if( check ){ - try { - fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name)); - /** 禁止不带扩展名的文件上传 */ - if (StringUtils.isEmpty(fileName)) { - check = false; - Exception exception = new ExceptionEmptyExtension( fileName ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - } - } - - if( check ){ - try { - mapping = ThisApplication.context().storageMappings().random( OkrAttachmentFileInfo.class ); - } catch (Exception e) { - check = false; - result.error( e ); - logger.warn( "系统在获取存储的时候发生异常！" ); - logger.error( e, effectivePerson, request, null ); - } - } - - if( check ){ - try { - attachment = this.concreteAttachment( mapping, work, fileName, effectivePerson, site ); - attachment.saveContent(mapping, bytes, fileName); - System.out.println("保存附件信息对象：attachment.getId()=" + attachment.getId() ); - System.out.println("保存附件信息对象：workId=" + workId ); - attachment = okrWorkBaseInfoService.saveAttachment( workId, attachment ); - Wo wo = new Wo(); - System.out.println("attachment.id=" + attachment.getId() ); - wo.setId( attachment.getId() ); - result.setData(wo); - } catch (Exception e) { - check = false; - result.error( e ); - logger.warn( "系统在保存文件和更新数据时候发生异常！" ); - logger.error( e, effectivePerson, request, null ); - } - } - return result; - } - - private OkrAttachmentFileInfo concreteAttachment(StorageMapping mapping, OkrWorkBaseInfo work, String name, EffectivePerson effectivePerson, String site) throws Exception { - OkrAttachmentFileInfo attachment = new OkrAttachmentFileInfo(); - String fileName = UUID.randomUUID().toString(); - String extension = FilenameUtils.getExtension( name ); - if ( StringUtils.isNotEmpty(extension)) { - fileName = fileName + "." + extension; - }else{ - throw new Exception("file extension is empty."); - } - if( name.indexOf( "\\" ) >0 ){ - name = StringUtils.substringAfterLast( name, "\\"); - } - if( name.indexOf( "/" ) >0 ){ - name = StringUtils.substringAfterLast( name, "/"); - } - attachment.setCreateTime( new Date() ); - attachment.setLastUpdateTime( new Date() ); - attachment.setExtension( extension ); - attachment.setName( name ); - attachment.setFileName( fileName ); - attachment.setStorage( mapping.getName() ); - attachment.setWorkInfoId( work.getId() ); - attachment.setCenterId( work.getCenterId() ); - attachment.setStatus( "正常" ); - attachment.setParentType( "工作" ); - attachment.setCreatorUid( effectivePerson.getDistinguishedName() ); - attachment.setSite( site ); - attachment.setFileHost( "" ); - attachment.setFilePath( "" ); - attachment.setKey( work.getId() ); - return attachment; - } - - public static class Wo extends WoId { - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/BaseAction.java deleted file mode 100644 index 35af355486..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/BaseAction.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrAttachmentFileInfoService; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkReportOperationService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrAttachmentFileInfoService okrAttachmentFileInfoService = new OkrAttachmentFileInfoService(); - protected OkrCenterWorkQueryService okrCenterWorkInfoService = new OkrCenterWorkQueryService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected OkrWorkReportOperationService okrWorkReportOperationService = new OkrWorkReportOperationService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/OkrAttachmentFileInfoAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/OkrAttachmentFileInfoAction.java deleted file mode 100644 index dc67d93d88..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/OkrAttachmentFileInfoAction.java +++ /dev/null @@ -1,340 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.glassfish.jersey.media.multipart.FormDataParam; - -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.mind.ActionListMindForCenterId; - -@Path("okrattachmentfileinfo") -@JaxrsDescribe("工作附件信息管理服务") -public class OkrAttachmentFileInfoAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrAttachmentFileInfoAction.class); - - @JaxrsMethodDescribe(value = "根据中心工作ID获取工作附件信息列表", action = ActionListMindForCenterId.class) - @GET - @Path("list/center/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listByCenterId(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListWithCenterId().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据中心工作ID获取中心工作所有附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据工作ID获取工作附件信息列表", action = ActionListWithWorkId.class) - @GET - @Path("list/work/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listByWorkId(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListWithWorkId().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据工作ID获取工作所有附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据工作汇报ID获取附件信息列表", action = ActionListWithReportId.class) - @GET - @Path("list/report/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listByWorkReportId(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListWithReportId().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据工作ID获取工作汇报所有附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据中心工作ID删除中心工作的附件信息数据对象", action = ActionDeleteCenterAttachment.class) - @DELETE - @Path("center/attachment/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void deleteCenterAttachment(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("中心工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDeleteCenterAttachment().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统附件信息ID删除中心工作附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据工作ID删除工作的工作附件信息数据对象", action = ActionDeleteWorkAttachment.class) - @DELETE - @Path("work/attachment/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void deleteWorkAttachment(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDeleteWorkAttachment().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统附件信息ID删除工作附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据工作汇报ID删除工作汇报的附件信息数据对象", action = ActionDeleteReportAttachment.class) - @DELETE - @Path("report/attachment/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void deleteReportAttachment(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("工作汇报ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDeleteReportAttachment().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统附件信息ID删除工作汇报附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作附件信息对象", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("附件信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统附件信息ID查询附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID下载指定附件", action = ActionReportAttachmentDownload.class) - @GET - @Path("download/report/{id}") - @Consumes(MediaType.APPLICATION_JSON) - public void reportAttachmentDownLoad(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionReportAttachmentDownload().execute(request, effectivePerson, id); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据Work下载附件,设定是否使用stream输出", action = ActionReportAttachmentDownloadStream.class) - @GET - @Path("download/report/{id}/stream/{stream}") - @Consumes(MediaType.APPLICATION_JSON) - public void reportAttachmentDownloadStream(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, - @JaxrsParameterDescribe("用.APPLICATION_OCTET_STREAM头输出") @PathParam("stream") Boolean stream) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionReportAttachmentDownloadStream().execute(request, effectivePerson, id, stream); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "上传附件.", action = ActionReportAttachmentUpload.class) - @POST - @Path("upload/report/{id}/site/{site}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.MULTIPART_FORM_DATA) - public void reportAttachmentUpload(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("汇报ID") @PathParam("id") String id, - @JaxrsParameterDescribe("位置") @FormDataParam("site") String site, - @FormDataParam(FILE_FIELD) final byte[] bytes, - @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionReportAttachmentUpload().execute(request, effectivePerson, id, site, bytes, disposition); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID下载指定附件", action = ActionWorkAttachmentDownload.class) - @GET - @Path("download/work/{id}") - @Consumes(MediaType.APPLICATION_JSON) - public void workAttachmentDownLoad(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionWorkAttachmentDownload().execute(request, effectivePerson, id); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据工作附件ID下载附件,设定是否使用stream输出", action = ActionWorkAttachmentDownloadStream.class) - @GET - @Path("download/work/{id}/stream/{stream}") - @Consumes(MediaType.APPLICATION_JSON) - public void workAttachmentDownloadStream(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, - @JaxrsParameterDescribe("用.APPLICATION_OCTET_STREAM头输出") @PathParam("stream") Boolean stream) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionWorkAttachmentDownloadStream().execute(request, effectivePerson, id, stream); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "为具体工作信息上传附件.", action = ActionWorkAttachmentUpload.class) - @POST - @Path("upload/work/{id}/site/{site}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.MULTIPART_FORM_DATA) - public void workAttachmentUpload(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作ID") @PathParam("id") String id, - @JaxrsParameterDescribe("位置") @FormDataParam("site") String site, - @FormDataParam(FILE_FIELD) final byte[] bytes, - @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionWorkAttachmentUpload().execute(request, effectivePerson, id, site, bytes, disposition); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID下载指定附件", action = ActionCenterAttachmentDownload.class) - @GET - @Path("download/center/{id}") - @Consumes(MediaType.APPLICATION_JSON) - public void centerAttachmentDownLoad(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionCenterAttachmentDownload().execute(request, effectivePerson, id); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据中心工作附件ID下载附件,设定是否使用stream输出", action = ActionCenterAttachmentDownloadStream.class) - @GET - @Path("download/center/{id}/stream/{stream}") - @Consumes(MediaType.APPLICATION_JSON) - public void centerAttachmentDownloadStream(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, - @JaxrsParameterDescribe("用.APPLICATION_OCTET_STREAM头输出") @PathParam("stream") Boolean stream) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionCenterAttachmentDownloadStream().execute(request, effectivePerson, id, stream); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "为中心工作信息上传附件.", action = ActionCenterAttachmentUpload.class) - @POST - @Path("upload/center/{id}/site/{site}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.MULTIPART_FORM_DATA) - public void centerAttachmentUpload(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("中心工作ID") @PathParam("id") String id, - @JaxrsParameterDescribe("位置") @FormDataParam("site") String site, - @FormDataParam(FILE_FIELD) final byte[] bytes, - @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionCenterAttachmentUpload().execute(request, effectivePerson, id, site, bytes, disposition); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentNotExistsException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentNotExistsException.java deleted file mode 100644 index 1654588162..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentNotExistsException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class AttachmentNotExistsException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public AttachmentNotExistsException( String id ) { - super("指定ID的附件信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentQueryByIdException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentQueryByIdException.java deleted file mode 100644 index 53dc495e22..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/AttachmentQueryByIdException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class AttachmentQueryByIdException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public AttachmentQueryByIdException( Throwable e, String id ) { - super("查询指定ID的附件信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentDelete.java deleted file mode 100644 index 3d487c766a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAttachmentDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAttachmentDelete( Throwable e, String id ) { - super("系统根据id删除附件信息时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentIdEmpty.java deleted file mode 100644 index fededa48e9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAttachmentIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAttachmentIdEmpty() { - super("id为空，无法继续进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentListByIds.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentListByIds.java deleted file mode 100644 index 483b472618..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentListByIds.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAttachmentListByIds extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAttachmentListByIds( Throwable e ) { - super("系统根据id列表查询附件信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentNotExists.java deleted file mode 100644 index 0b0764c359..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAttachmentNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAttachmentNotExists( String id ) { - super("指定id的附件信息不存在，无法继续进行操作。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentQueryById.java deleted file mode 100644 index f1be60dd7c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAttachmentQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAttachmentQueryById( Throwable e, String id ) { - super("系统根据id查询附件信息时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentWrapOut.java deleted file mode 100644 index b78bb42e7d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionAttachmentWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAttachmentWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAttachmentWrapOut( Throwable e ) { - super("系统根据id列表查询附件信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkIdEmpty.java deleted file mode 100644 index d410ee0afe..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkIdEmpty() { - super("id为空，无法继续进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkNotExists.java deleted file mode 100644 index 21333cbfd7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkNotExists( String id ) { - super("指定id的中心工作信息不存在，无法继续进行操作。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkQueryById.java deleted file mode 100644 index 263281ea21..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionCenterWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkQueryById( Throwable e, String id ) { - super("系统根据id查询中心工作信息时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionEmptyExtension.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionEmptyExtension.java deleted file mode 100644 index 5ff09f4f7d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionEmptyExtension.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionEmptyExtension extends PromptException { - - private static final long serialVersionUID = 4132300948670472899L; - - public ExceptionEmptyExtension(String name) { - super("不能上传文件扩展名为空的文件: {}.", name); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 0b3b783180..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionInsufficientPermissions.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionInsufficientPermissions.java deleted file mode 100644 index c0110e04c1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionInsufficientPermissions.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionInsufficientPermissions extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionInsufficientPermissions( String name, String id ) { - super("附件操作权限不足。Id:" + id + ", Name:" + name ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 8e447e36d0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkNotExists.java deleted file mode 100644 index 80421ddc3d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("指定ID的具体工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkQueryById.java deleted file mode 100644 index 5bb2b6ead0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkQueryById( Throwable e, String id ) { - super("系统根据id查询工作信息时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportIdEmpty.java deleted file mode 100644 index a52e5a1199..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportIdEmpty() { - super("id为空，无法继续进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportNotExists.java deleted file mode 100644 index 0d7725e525..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportNotExists( String id ) { - super("指定id的工作汇报信息不存在，无法继续进行操作。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportQueryById.java deleted file mode 100644 index c961fac809..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ExceptionWorkReportQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportQueryById( Throwable e, String id ) { - super("系统根据id查询工作汇报信息时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ReportAttachmentUploadException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ReportAttachmentUploadException.java deleted file mode 100644 index 3f6b4ea575..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/ReportAttachmentUploadException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ReportAttachmentUploadException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ReportAttachmentUploadException( Throwable e ) { - super("系统在上传工作汇报附件过程中发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/URLParameterGetException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/URLParameterGetException.java deleted file mode 100644 index d8d166eb94..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/URLParameterGetException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class URLParameterGetException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public URLParameterGetException( Throwable e ) { - super("系统在解析传入的URL参数时发生异常.", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkNotExistsException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkNotExistsException.java deleted file mode 100644 index 0a40100d92..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkNotExistsException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -class WorkNotExistsException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - WorkNotExistsException( String id ) { - super("指定ID的工作记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkQueryByIdException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkQueryByIdException.java deleted file mode 100644 index c015f2878a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkQueryByIdException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -class WorkQueryByIdException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - WorkQueryByIdException( Throwable e, String id ) { - super("查询指定ID的工作信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportNotExistsException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportNotExistsException.java deleted file mode 100644 index 5ceb807e94..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportNotExistsException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkReportNotExistsException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkReportNotExistsException( String id ) { - super("指定ID的工作汇报信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportQueryByIdException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportQueryByIdException.java deleted file mode 100644 index dbe5803bf7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrattachmentfileinfo/exception/WorkReportQueryByIdException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkReportQueryByIdException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkReportQueryByIdException( Throwable e, String id ) { - super("查询指定ID的工作汇报信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkAuthorize.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkAuthorize.java deleted file mode 100644 index 7fe86797a5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkAuthorize.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.dataadapter.webservice.sms.SmsMessageOperator; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionAuthorizeOpinionEmpty; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionAuthorizeTakerIdentityEmpty; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionAuthorizeWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionPersonNotExists; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionSystemConfigFetch; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionSystemConfigNotFetch; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkAuthorizeNotOpen; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkAuthorizeProcess; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkAuthorizeService; -import com.x.okr.entity.OkrConfigSystem; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionWorkAuthorize extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionWorkAuthorize.class ); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - - /** - * 工作处理授权服务
- * - * 问题：
- * 1、授权后，原有责任者是否有处理权限，是否应用把身份转换为授权者，取消继续处理权限？
- * 2、工作被拆解或者直接确认后，授权者是否需要收到一个通知，或者待阅等
- * - * 处理思路：
- * 1、将工作责任者身份替换为被授权者
- * 2、将干系人信息中的责任者身份转换为授权者（或者不用转换）
- * 3、删除原责任者的待办，转换为原责任者已办
- * 4、新增新的责任者待办
- *
- * PUT PARAMETER : workId (工作ID)
- * PUT PARAMETER : authorizeOpinion (工作授权意见)
- * PUT PARAMETER : authorizeIdentity (工作授权者身份)
- * PUT PARAMETER : undertakerIdentity (工作授权承担人身份)
- * - * @param request - * @return - */ - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult(); - OkrConfigSystem okrConfigSystem = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrUserCache okrUserCache = null; - String personName = null; - String workId = null; - String authorizeOpinion = null; - String authorizeIdentity = null; - String undertakerIdentity = null; - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - if( wrapIn != null ){ - workId = wrapIn.getWorkId(); - authorizeOpinion = wrapIn.getAuthorizeOpinion(); - undertakerIdentity = wrapIn.getUndertakerIdentity(); - } - } - if( check ){ - try {//1、判断系统是否已经开启授权操作WORK_AUTHORIZE - okrConfigSystem = okrConfigSystemService.getWithConfigCode( "WORK_AUTHORIZE" ); - if( okrConfigSystem == null ){ - check = false; - Exception exception = new ExceptionSystemConfigNotFetch( "WORK_AUTHORIZE"); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigFetch( e, "WORK_AUTHORIZE"); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( !"OPEN".equals( okrConfigSystem.getConfigValue() )){ - check = false; - Exception exception = new ExceptionWorkAuthorizeNotOpen(); - result.error( exception ); - } - } - if( check ){ - personName = okrUserManagerService.getPersonNameByIdentity( undertakerIdentity ); - if( personName == null ){ - check = false; - Exception exception = new ExceptionPersonNotExists( undertakerIdentity ); - result.error( exception ); - } - } - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - if( okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - authorizeIdentity = okrUserCache.getLoginIdentityName(); - } - if( check ){ - if( workId == null || workId.isEmpty() ){ - check = false; - Exception exception = new ExceptionAuthorizeWorkIdEmpty(); - result.error( exception ); - } - } - if( check ){ - if( authorizeOpinion == null || authorizeOpinion.isEmpty() ){ - check = false; - Exception exception = new ExceptionAuthorizeOpinionEmpty(); - result.error( exception ); - } - } - if( check ){ - if( undertakerIdentity == null || undertakerIdentity.isEmpty() ){ - check = false; - Exception exception = new ExceptionAuthorizeTakerIdentityEmpty(); - result.error( exception ); - } - } - if( check ){ - try {//2、工作信息是否已经存在 - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( workId ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - OkrWorkAuthorizeService okrWorkAuthorizeService = new OkrWorkAuthorizeService(); - try { - okrWorkAuthorizeService.authorize( okrWorkBaseInfo, authorizeIdentity, undertakerIdentity, authorizeOpinion ); - - WrapInWorkDynamic.sendWithWorkInfo( - okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName(), - "工作授权", - "工作授权成功！" - ); - - //工作授权承接收短信 - SmsMessageOperator.sendWithPersonName( personName, "您有工作'"+okrWorkBaseInfo.getTitle()+"'已经授权给您，请及时办理！"); - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkAuthorizeProcess( e, workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - return result; - } - - public static class Wi { - - @FieldDescribe( "授权工作ID." ) - private String workId = null; - - @FieldDescribe( "授权者身份." ) - private String authorizeIdentity = null; - - @FieldDescribe( "承担者身份." ) - private String undertakerIdentity = null; - - @FieldDescribe( "授权意见." ) - private String authorizeOpinion = null; - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getAuthorizeIdentity() { - return authorizeIdentity; - } - - public void setAuthorizeIdentity(String authorizeIdentity) { - this.authorizeIdentity = authorizeIdentity; - } - - public String getUndertakerIdentity() { - return undertakerIdentity; - } - - public void setUndertakerIdentity(String undertakerIdentity) { - this.undertakerIdentity = undertakerIdentity; - } - - public String getAuthorizeOpinion() { - return authorizeOpinion; - } - - public void setAuthorizeOpinion(String authorizeOpinion) { - this.authorizeOpinion = authorizeOpinion; - } - - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkTackback.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkTackback.java deleted file mode 100644 index 55fb50ffd2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/ActionWorkTackback.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionAuthorizeWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWorkTackbackProcess; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrWorkAuthorizeService; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionWorkTackback extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionWorkTackback.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { - ActionResult result = new ActionResult(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - Boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - if( okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - wrapIn.setAuthorizeIdentity( okrUserCache.getLoginIdentityName() ); - } - if( check ){ - if( wrapIn.getWorkId() == null || wrapIn.getWorkId().isEmpty() ){ - check = false; - Exception exception = new ExceptionAuthorizeWorkIdEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } - - //2、工作信息是否已经存在 - if( check ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - OkrWorkAuthorizeService okrWorkAuthorizeService = new OkrWorkAuthorizeService(); - try { - okrWorkAuthorizeService.tackback( okrWorkBaseInfo, wrapIn.getAuthorizeIdentity() ); - - WrapInWorkDynamic.sendWithWorkInfo( - okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName(), - "授权收回", - "工作授权收回成功！" - ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkTackbackProcess( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - return result; - } - - public static class Wi { - - @FieldDescribe( "授权工作ID." ) - private String workId = null; - - @FieldDescribe( "授权者身份." ) - private String authorizeIdentity = null; - - @FieldDescribe( "承担者身份." ) - private String undertakerIdentity = null; - - @FieldDescribe( "授权意见." ) - private String authorizeOpinion = null; - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getAuthorizeIdentity() { - return authorizeIdentity; - } - - public void setAuthorizeIdentity(String authorizeIdentity) { - this.authorizeIdentity = authorizeIdentity; - } - - public String getUndertakerIdentity() { - return undertakerIdentity; - } - - public void setUndertakerIdentity(String undertakerIdentity) { - this.undertakerIdentity = undertakerIdentity; - } - - public String getAuthorizeOpinion() { - return authorizeOpinion; - } - - public void setAuthorizeOpinion(String authorizeOpinion) { - this.authorizeOpinion = authorizeOpinion; - } - - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/BaseAction.java deleted file mode 100644 index c6e02aea38..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/BaseAction.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/OkrWorkAuthorizeAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/OkrWorkAuthorizeAction.java deleted file mode 100644 index 47f54a3c92..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/OkrWorkAuthorizeAction.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.OkrAttachmentFileInfoAction; - -@Path("okrauthorize") -@JaxrsDescribe("工作授权管理服务") -public class OkrWorkAuthorizeAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrAttachmentFileInfoAction.class); - - @JaxrsMethodDescribe(value = "工作处理授权服务", action = ActionWorkAuthorize.class) - @PUT - @Path("work") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void workAuthorize(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionWorkAuthorize().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统进行工作授权执行过程发生异常。"); - logger.error(e, effectivePerson, request, null); - - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - /** - * 工作授权收回服务 - * - * PUT PARAMETER : workId - * - * @param request - * @return - */ - @JaxrsMethodDescribe(value = "工作授权收回服务", action = ActionWorkTackback.class) - @PUT - @Path("takeback") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void takeback(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionWorkTackback().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统对已经授权的工作进行收回操作过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeOpinionEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeOpinionEmpty.java deleted file mode 100644 index 31a4a0a088..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeOpinionEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAuthorizeOpinionEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAuthorizeOpinionEmpty() { - super("工作授权意见为空，无法继续进行授权操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeTakerIdentityEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeTakerIdentityEmpty.java deleted file mode 100644 index a9fc497c0f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeTakerIdentityEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAuthorizeTakerIdentityEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAuthorizeTakerIdentityEmpty() { - super("工作授权承担者为空，无法继续进行授权操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeWorkIdEmpty.java deleted file mode 100644 index e9a7a004c9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionAuthorizeWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAuthorizeWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAuthorizeWorkIdEmpty() { - super("授权工作id为空，无法继续进行授权操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 7ede8fb779..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionPersonNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionPersonNotExists.java deleted file mode 100644 index 9c8003fc58..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionPersonNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionPersonNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionPersonNotExists( String name ) { - super("人员不存在。Person:" + name ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigFetch.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigFetch.java deleted file mode 100644 index fcdeaedb94..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigFetch.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigFetch extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigFetch( Throwable e, String code ) { - super("系统参数查询时发生异常。Code:" + code, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigNotFetch.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigNotFetch.java deleted file mode 100644 index 9e4cc9159c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionSystemConfigNotFetch.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigNotFetch extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigNotFetch( String code ) { - super("系统异常，系统参数不存在:" + code ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 3b0a4c5db3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeNotOpen.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeNotOpen.java deleted file mode 100644 index a2018cf970..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeNotOpen.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkAuthorizeNotOpen extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkAuthorizeNotOpen() { - super("工作授权功能未被开启，无法执行授权相关操作！" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeProcess.java deleted file mode 100644 index 448f19333f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkAuthorizeProcess.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkAuthorizeProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkAuthorizeProcess( Throwable e, String id ) { - super("对工作进行授权操作过程中发生异常。Id:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkNotExists.java deleted file mode 100644 index 4ec64e86fc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("工作不存在。Id:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkQueryById.java deleted file mode 100644 index c6951c835f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkQueryById( Throwable e, String id ) { - super("根据ID查询工作信息时发生异常。Id:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkTackbackProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkTackbackProcess.java deleted file mode 100644 index e97bfc1680..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWorkTackbackProcess.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTackbackProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTackbackProcess( Throwable e, String id ) { - super("对工作进行授权收回操作过程中发生异常。Id:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 66d01efb2f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrauthorize/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrauthorize.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionArchive.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionArchive.java deleted file mode 100644 index 2c4dd6b6b1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionArchive.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkArchive; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrCenterWorkOperationService; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionArchive extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionArchive.class ); - - private OkrCenterWorkOperationService okrCenterWorkOperationService = new OkrCenterWorkOperationService(); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrUserCache okrUserCache = null; - Boolean check = true; - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - okrUserCache = checkUserLogin( effectivePerson.getDistinguishedName() ); - if( okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - if( check ){ - try { - okrCenterWorkInfo = okrCenterWorkQueryService.get( id ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrCenterWorkOperationService.archive( id ); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - if( okrCenterWorkInfo != null ){ - WrapInWorkDynamic.sendWithCenterWorkInfo( - okrCenterWorkInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName(), - "归档中心工作", - "中心工作归档成功！" - ); - } - }catch(Exception e){ - Exception exception = new ExceptionCenterWorkArchive( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDelete.java deleted file mode 100644 index 665d2008a1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDelete.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkDelete; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrCenterWorkOperationService; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - private OkrCenterWorkOperationService okrCenterWorkOperationService = new OkrCenterWorkOperationService(); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrUserCache okrUserCache = null; - Boolean check = true; - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - okrUserCache = checkUserLogin( effectivePerson.getDistinguishedName() ); - if( okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - if( check ){ - try { - okrCenterWorkInfo = okrCenterWorkQueryService.get( id ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - try{ - okrCenterWorkOperationService.delete( id ); - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - if( okrCenterWorkInfo != null ){ - WrapInWorkDynamic.sendWithCenterWorkInfo( - okrCenterWorkInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName(), - "删除中心工作", - "中心工作删除成功！" - ); - } - }catch(Exception e){ - Exception exception = new ExceptionCenterWorkDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeleteAdmin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeleteAdmin.java deleted file mode 100644 index f3221bd8f9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeleteAdmin.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkDelete; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrOperationDynamicSave; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionDeleteAdmin extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDeleteAdmin.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - Boolean check = true; - EffectivePerson currentPerson = this.effectivePerson(request); - try { - if ( !okrUserInfoService.getIsOkrManager( currentPerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions( currentPerson.getDistinguishedName(), ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - if (id == null || id.isEmpty()) { - check = false; - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error(exception); - } - } - if (check) { - try { - okrCenterWorkInfo = okrCenterWorkQueryService.get(id); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionCenterWorkQueryById(e, id); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check) { - try { - okrCenterWorkOperationService.delete(id); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionCenterWorkDelete(e, id); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check) { - try { - if( okrCenterWorkInfo != null ){ - WrapInWorkDynamic.sendWithCenterWorkInfo( - okrCenterWorkInfo, - effectivePerson.getDistinguishedName(), - "管理员操作", - "管理员操作", - "删除中心工作", - "中心工作删除成功！" - ); - } - } catch (Exception e) { - Exception exception = new ExceptionOkrOperationDynamicSave(e, id); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeploy.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeploy.java deleted file mode 100644 index e6ebfe4f90..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDeploy.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.dataadapter.webservice.sms.SmsMessageOperator; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkDeploy; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionDeployableWorkQuery; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionWorkDeploy; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionWorkTaskCreate; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionWorkTaskRemove; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrCenterWorkOperationService; -import com.x.okr.assemble.control.service.OkrSendNotifyService; -import com.x.okr.assemble.control.service.OkrTaskService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoDeployService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionDeploy extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDeploy.class ); - - private OkrWorkBaseInfoQueryService okrWorkBaseInfoQueryService = new OkrWorkBaseInfoQueryService(); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private OkrWorkBaseInfoDeployService okrWorkBaseInfoDeployService = new OkrWorkBaseInfoDeployService(); - private OkrCenterWorkOperationService okrCenterWorkOperationService = new OkrCenterWorkOperationService(); - private OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - private OkrTaskService okrTaskService = new OkrTaskService(); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - List okrWorkBaseInfoList = null; - List deployAbleWorkBaseInfoList = new ArrayList<>(); - List deployWorkIds = null; - List deployAbleWorkIds = new ArrayList<>(); - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error( exception ); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - try{ - okrCenterWorkInfo = okrCenterWorkQueryService.get( id ); - if( okrCenterWorkInfo == null ){ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( id ); - result.error( exception ); - } - }catch( Exception e){ - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - //查询该中心工作下, 用户所有部署的,处理状态为草稿的工作ID列表 - try { - deployWorkIds = okrWorkPersonService.listDistinctWorkIdsByWorkAndIdentity( okrCenterWorkInfo.getId(), null, okrUserCache.getLoginIdentityName(), "部署者", null ); - if( deployWorkIds != null && !deployWorkIds.isEmpty() ){ - okrWorkBaseInfoList = okrWorkBaseInfoQueryService.listByIds( deployWorkIds ); - if( okrWorkBaseInfoList != null && !okrWorkBaseInfoList.isEmpty() ){ - for( OkrWorkBaseInfo work : okrWorkBaseInfoList ){ - if( work != null && "草稿".equals( work.getWorkProcessStatus() )){ - deployAbleWorkBaseInfoList.add( work ); - deployAbleWorkIds.add( work.getId() ); - } - } - } - } - } catch (Exception e) { - Exception exception = new ExceptionDeployableWorkQuery( e, okrCenterWorkInfo.getId(), okrUserCache.getLoginIdentityName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrWorkBaseInfoDeployService.deploy( deployAbleWorkIds, okrUserCache.getLoginIdentityName() ); - for( OkrWorkBaseInfo _okrWorkBaseInfo : deployAbleWorkBaseInfoList ){ - //工作的责任者接收短信 - SmsMessageOperator.sendWithPersonName( _okrWorkBaseInfo.getResponsibilityEmployeeName(), "您有工作'"+_okrWorkBaseInfo.getTitle()+"'，请及时办理！"); - - //工作协助者接收短信 - if( ListTools.isNotEmpty( _okrWorkBaseInfo.getCooperateEmployeeNameList()) ) { - for( String name : _okrWorkBaseInfo.getCooperateEmployeeNameList() ) { - SmsMessageOperator.sendWithPersonName( name, "您有工作'"+_okrWorkBaseInfo.getTitle()+"'，请协助办理！"); - } - } - - WrapInWorkDynamic.sendWithWorkInfo( - _okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "部署具体工作", - "具体工作部署成功！" - ); - } - } catch( Exception e ){ - check = false; - Exception exception = new ExceptionWorkDeploy( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - if( okrCenterWorkInfo != null ){ - okrCenterWorkOperationService.deploy( id ); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - WrapInWorkDynamic.sendWithCenterWorkInfo( - okrCenterWorkInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "部署中心工作", - "中心工作部署成功！" - ); - - //中心工作部署成功，通知部署者 - new OkrSendNotifyService().notifyDeployerForCenterWorkDeploySuccess( okrCenterWorkInfo ); - }else{ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( id ); - result.error( exception ); - } - }catch( Exception e){ - check = false; - Exception exception = new ExceptionCenterWorkDeploy( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( deployWorkIds != null && !deployWorkIds.isEmpty() ){ - try { - okrWorkBaseInfoOperationService.createTasks( deployWorkIds, okrUserCache.getLoginIdentityName() ); - }catch( Exception e ){ - Exception exception = new ExceptionWorkTaskCreate( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - try { - okrTaskService.deleteTask( okrCenterWorkInfo, okrUserCache.getLoginIdentityName() ); - }catch( Exception e ){ - Exception exception = new ExceptionWorkTaskRemove( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDraftNewCenter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDraftNewCenter.java deleted file mode 100644 index 2d65f367d6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionDraftNewCenter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrConfigWorkType; - -public class ActionDraftNewCenter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDraftNewCenter.class ); - - /** - * 1、生成新的中心工作ID
- * 2、查询系统配置的汇报审核领导身份
- * 3、查询系统中配置的所有工作类别列表
- * 4、给出中心工作草稿应该有的操作列表：
- * 1）创建具体工作
- * 2）导入具体工作
- * 3）关闭
- * @param effectivePerson - * @param wrapIn - * @return - * @throws Exception - */ - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo okrCenterWorkDraft = new Wo(); - List wrapOutTypes = new ArrayList<>(); - List operation = new ArrayList<>(); - List types = null; - - WoOkrWorkType wrapOutType = null; - String report_audit_leader = null; - OkrUserCache okrUserCache = null; - - String cfg_report_audit_leader = null; - Boolean check = true; - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check && okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - okrCenterWorkDraft.setCreatorName( okrUserCache.getLoginUserName() ); - okrCenterWorkDraft.setCreatorIdentity( okrUserCache.getLoginIdentityName() ); - okrCenterWorkDraft.setCreatorUnitName( okrUserCache.getLoginUserUnitName() ); - okrCenterWorkDraft.setCreatorTopUnitName( okrUserCache.getLoginUserTopUnitName() ); - okrCenterWorkDraft.setDeployerName( okrUserCache.getLoginUserName() ); - okrCenterWorkDraft.setDeployerIdentity( okrUserCache.getLoginIdentityName() ); - okrCenterWorkDraft.setDeployerUnitName( okrUserCache.getLoginUserUnitName() ); - okrCenterWorkDraft.setDeployerTopUnitName( okrUserCache.getLoginUserTopUnitName() ); - } - if( check ){ - String[] array = null; - List identies = new ArrayList<>(); - List names = new ArrayList<>(); - cfg_report_audit_leader = okrConfigSystemService.getValueWithConfigCode( "REPORT_AUDIT_LEADER" ); - if( cfg_report_audit_leader != null && !cfg_report_audit_leader.isEmpty() ){ - array = cfg_report_audit_leader.split(","); - if( array != null && array.length > 0 ){ - for( String identity : array ){ - //查询该领导对应的员工信息,并且取出姓名 - report_audit_leader = okrUserManagerService.getPersonNameByIdentity( identity ); - if( report_audit_leader != null ){ - identies.add( identity ); - names.add( report_audit_leader ); - } - } - } -// okrCenterWorkDraft.setAuditLeaderIdentityList(identies); -// okrCenterWorkDraft.setAuditLeaderNameList(names); - okrCenterWorkDraft.setDefaultLeaderIdentityList(identies); - okrCenterWorkDraft.setDefaultLeaderList(names); - okrCenterWorkDraft.setReportAuditLeaderIdentityList(identies); - okrCenterWorkDraft.setReportAuditLeaderNameList(names); - } - } - if( check ){ - types = okrConfigWorkTypeService.listAll(); - if( types != null && !types.isEmpty() ){ - for( OkrConfigWorkType type : types ){ - wrapOutType = new WoOkrWorkType( type.getId(), type.getWorkTypeName(), type.getOrderNumber() ); - wrapOutTypes.add( wrapOutType ); - } - SortTools.asc( wrapOutTypes, "orderNumber"); - okrCenterWorkDraft.setWorkTypes( wrapOutTypes ); - } - } - if( check ){ - operation.add( "CREATEWORK" ); - operation.add( "IMPORTWORK" ); - operation.add( "CLOSE" ); - okrCenterWorkDraft.setOperation(operation); - okrCenterWorkDraft.setStatus( "正常" ); - okrCenterWorkDraft.setProcessStatus( "草稿" ); - okrCenterWorkDraft.setTitle("无标题"); - okrCenterWorkDraft.setDescription( "无" ); - okrCenterWorkDraft.setCreateTime( new Date() ); - } - result.setData( okrCenterWorkDraft ); - result.setCount( 1L ); - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGet.java deleted file mode 100644 index cb838c7ea3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGet.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrConfigWorkType; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - WoOkrWorkType wrapOutType = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrUserCache okrUserCache = null; - List wrapOutTypes = new ArrayList<>(); - List operation = new ArrayList<>(); - List types = null; - Boolean check = true; - - if( id != null && !id.isEmpty() ){ - try { - okrCenterWorkInfo = okrCenterWorkQueryService.get( id ); - } catch (Exception e) { - Exception exception = new ExceptionCenterWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check && okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - if( okrCenterWorkInfo != null ){ - //判断中心工作的操作列表 - wrap = Wo.copier.copy( okrCenterWorkInfo ); - if( wrap != null ){ - wrap.setIsNew( false );//不是新创建的草稿, 是已存在的 - if( "草稿".equals( wrap.getProcessStatus() )){ - //查询所有的工作类别，初始化选择框时需要 - types = okrConfigWorkTypeService.listAll(); - if( types != null && !types.isEmpty() ){ - for( OkrConfigWorkType type : types ){ - wrapOutType = new WoOkrWorkType( type.getId(), type.getWorkTypeName(), type.getOrderNumber() ); - wrapOutTypes.add( wrapOutType ); - } - SortTools.asc( wrapOutTypes, "orderNumber"); - wrap.setWorkTypes( wrapOutTypes ); - } - } - operation = new ActionListOperationWithId().execute( request, effectivePerson, okrUserCache, wrap.getId() ); - wrap.setOperation( operation ); - } - result.setData(wrap); - }else{ - result = new ActionDraftNewCenter().execute( request, effectivePerson); - } - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGetAdmin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGetAdmin.java deleted file mode 100644 index 356cccbad4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionGetAdmin.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionGetAdmin extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetAdmin.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrCenterWorkInfo OkrCenterWorkInfo = null; - Boolean check = true; - EffectivePerson currentPerson = this.effectivePerson(request); - try { - if ( !okrUserInfoService.getIsOkrManager( currentPerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions( currentPerson.getDistinguishedName(), ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - if (id == null || id.isEmpty()) { - check = false; - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error(exception); - } - } - try { - OkrCenterWorkInfo = okrCenterWorkQueryService.get(id); - if (OkrCenterWorkInfo != null) { - wrap = Wo.copier.copy( OkrCenterWorkInfo ); - result.setData(wrap); - } else { - Exception exception = new ExceptionCenterWorkNotExists(id); - result.error(exception); - } - } catch (Exception e) { - Exception exception = new ExceptionCenterWorkQueryById(e, id); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityNextWithFilter.java deleted file mode 100644 index 1ec4cfca46..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityNextWithFilter.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkWrapOut; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionListByProcessIdentityNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListByProcessIdentityNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrCenterWorkInfoList = null; - Long total = 0L; - List processIdentities = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if(check){ - wrapIn.addQueryEmployeeIdentities( okrUserCache.getLoginIdentityName() ); - okrCenterWorkInfoList = okrCenterWorkQueryService.listCenterNextWithFilter( id, count, wrapIn ); - total = okrCenterWorkQueryService.getCenterCountWithFilter( wrapIn ); - } - if(check){ - if( okrCenterWorkInfoList != null && !okrCenterWorkInfoList.isEmpty() ){ - try{ - wraps = Wo.copier.copy( okrCenterWorkInfoList ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionCenterWorkWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - if( ListTools.isNotEmpty(wraps) ){ - for( Wo wrap : wraps ){ - processIdentities = new ArrayList<>(); - processIdentities.add( "VIEW" ); - if( wrap.getReportAuditLeaderIdentity() != null && !wrap.getReportAuditLeaderIdentity().isEmpty() ){ - if( wrap.getReportAuditLeaderIdentity().indexOf( okrUserCache.getLoginIdentityName() ) > 0 ){ - processIdentities.add("REPORTAUDIT");//汇报审核领导 - } - } - if ( okrWorkProcessIdentityService.isMyDeployCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("DEPLOY");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyReadCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("READ");//判断工作是否由我阅知 - } - List operations = new ActionListOperationWithId().execute( request, effectivePerson, okrUserCache, wrap.getId() ); - wrap.setOperation( operations ); - wrap.setWorkProcessIdentity( processIdentities ); - } - } - result.setCount( total ); - result.setData( wraps ); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - - public static class Wo { - - public static WrapCopier copier = WrapCopierFactory.wo( OkrCenterWorkInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe( "中心工作ID" ) - private String id = ""; - - @FieldDescribe( "中心标题" ) - private String title = ""; - - @FieldDescribe( "部署者姓名" ) - private String deployerName = ""; - - @FieldDescribe( "部署者身份" ) - private String deployerIdentity = ""; - - @FieldDescribe( "部署者所属组织" ) - private String deployerUnitName = ""; - - @FieldDescribe( "部署者所属顶层组织" ) - private String deployerTopUnitName = ""; - - @FieldDescribe( "审核者姓名" ) - private String auditLeaderName = ""; - - @FieldDescribe( "审核者身份" ) - private String auditLeaderIdentity = ""; - - @FieldDescribe( "中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消" ) - private String processStatus = "草稿"; - - @FieldDescribe( "中心工作默认完成日期-字符串，显示用：yyyy-mm-dd" ) - private String defaultCompleteDateLimitStr = ""; - - @FieldDescribe( "中心工作默认工作类别" ) - private String defaultWorkType = ""; - - @FieldDescribe( "中心工作默认工作级别" ) - private String defaultWorkLevel = ""; - - @FieldDescribe( "中心工作默认阅知领导(可多值，显示用)" ) - private String defaultLeader = ""; - - @FieldDescribe( "中心工作默认阅知领导身份(可多值，计算组织和顶层组织用)" ) - private String defaultLeaderIdentity = ""; - - @FieldDescribe( "工作汇报审批领导(可多值，显示用)" ) - private String reportAuditLeaderName = ""; - - @FieldDescribe( "工作汇报审批领导身份(可多值，计算组织和顶层组织用)" ) - private String reportAuditLeaderIdentity = ""; - - @FieldDescribe( "中心工作是否需要审核" ) - private Boolean isNeedAudit = false; - - @FieldDescribe( "处理状态：正常|已删除" ) - private String status = "正常"; - - @FieldDescribe( "中心工作描述" ) - private String description = ""; - - @FieldDescribe( "工作处理职责身份(多值): VIEW(观察者)|DEPLOY(部署者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)|REPORTAUDIT(汇报审核者)" ) - private List workProcessIdentity = null; - - @FieldDescribe( "用户可以对工作进行的操作(多值):VIEW|EDIT|DELETE" ) - private List operation = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getAuditLeaderName() { - return auditLeaderName; - } - - public void setAuditLeaderName(String auditLeaderName) { - this.auditLeaderName = auditLeaderName; - } - - public String getAuditLeaderIdentity() { - return auditLeaderIdentity; - } - - public void setAuditLeaderIdentity(String auditLeaderIdentity) { - this.auditLeaderIdentity = auditLeaderIdentity; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - public String getDefaultLeader() { - return defaultLeader; - } - - public void setDefaultLeader(String defaultLeader) { - this.defaultLeader = defaultLeader; - } - - public String getDefaultLeaderIdentity() { - return defaultLeaderIdentity; - } - - public void setDefaultLeaderIdentity(String defaultLeaderIdentity) { - this.defaultLeaderIdentity = defaultLeaderIdentity; - } - - public String getReportAuditLeaderName() { - return reportAuditLeaderName; - } - - public void setReportAuditLeaderName(String reportAuditLeaderName) { - this.reportAuditLeaderName = reportAuditLeaderName; - } - - public String getReportAuditLeaderIdentity() { - return reportAuditLeaderIdentity; - } - - public void setReportAuditLeaderIdentity(String reportAuditLeaderIdentity) { - this.reportAuditLeaderIdentity = reportAuditLeaderIdentity; - } - - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityPrevWithFilter.java deleted file mode 100644 index 65b22180e2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListByProcessIdentityPrevWithFilter.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkWrapOut; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionListByProcessIdentityPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListByProcessIdentityPrevWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrCenterWorkInfoList = null; - Long total = 0L; - List processIdentities = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if(check){ - wrapIn.addQueryEmployeeIdentities( okrUserCache.getLoginIdentityName() ); - okrCenterWorkInfoList = okrCenterWorkQueryService.listCenterPrevWithFilter( id, count, wrapIn ); - total = okrCenterWorkQueryService.getCenterCountWithFilter( wrapIn ); - } - - if(check){ - if( okrCenterWorkInfoList != null && !okrCenterWorkInfoList.isEmpty() ){ - try{ - wraps = Wo.copier.copy( okrCenterWorkInfoList ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionCenterWorkWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - if( ListTools.isNotEmpty(wraps) ){ - for( Wo wrap : wraps ){ - processIdentities = new ArrayList<>(); - processIdentities.add( "VIEW" ); - if( wrap.getReportAuditLeaderIdentity() != null && !wrap.getReportAuditLeaderIdentity().isEmpty() ){ - if( wrap.getReportAuditLeaderIdentity().indexOf( okrUserCache.getLoginIdentityName() ) > 0 ){ - processIdentities.add("REPORTAUDIT");//汇报审核领导 - } - } - if ( okrWorkProcessIdentityService.isMyDeployCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("DEPLOY");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyReadCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("READ");//判断工作是否由我阅知 - } - List operations = new ActionListOperationWithId().execute( request, effectivePerson, okrUserCache, wrap.getId() ); - wrap.setOperation( operations ); - wrap.setWorkProcessIdentity( processIdentities ); - } - } - result.setCount( total ); - result.setData( wraps ); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - - public static class Wo { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrCenterWorkInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe( "中心工作ID" ) - private String id = ""; - - @FieldDescribe( "中心标题" ) - private String title = ""; - - @FieldDescribe( "部署者姓名" ) - private String deployerName = ""; - - @FieldDescribe( "部署者身份" ) - private String deployerIdentity = ""; - - @FieldDescribe( "部署者所属组织" ) - private String deployerUnitName = ""; - - @FieldDescribe( "部署者所属顶层组织" ) - private String deployerTopUnitName = ""; - - @FieldDescribe( "审核者姓名" ) - private String auditLeaderName = ""; - - @FieldDescribe( "审核者身份" ) - private String auditLeaderIdentity = ""; - - @FieldDescribe( "中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消" ) - private String processStatus = "草稿"; - - @FieldDescribe( "中心工作默认完成日期-字符串，显示用：yyyy-mm-dd" ) - private String defaultCompleteDateLimitStr = ""; - - @FieldDescribe( "中心工作默认工作类别" ) - private String defaultWorkType = ""; - - @FieldDescribe( "中心工作默认工作级别" ) - private String defaultWorkLevel = ""; - - @FieldDescribe( "中心工作默认阅知领导(可多值，显示用)" ) - private String defaultLeader = ""; - - @FieldDescribe( "中心工作默认阅知领导身份(可多值，计算组织和顶层组织用)" ) - private String defaultLeaderIdentity = ""; - - @FieldDescribe( "工作汇报审批领导(可多值，显示用)" ) - private String reportAuditLeaderName = ""; - - @FieldDescribe( "工作汇报审批领导身份(可多值，计算组织和顶层组织用)" ) - private String reportAuditLeaderIdentity = ""; - - @FieldDescribe( "中心工作是否需要审核" ) - private Boolean isNeedAudit = false; - - @FieldDescribe( "处理状态：正常|已删除" ) - private String status = "正常"; - - @FieldDescribe( "中心工作描述" ) - private String description = ""; - - @FieldDescribe( "工作处理职责身份(多值): VIEW(观察者)|DEPLOY(部署者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)|REPORTAUDIT(汇报审核者)" ) - private List workProcessIdentity = null; - - @FieldDescribe( "用户可以对工作进行的操作(多值):VIEW|EDIT|DELETE" ) - private List operation = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getAuditLeaderName() { - return auditLeaderName; - } - - public void setAuditLeaderName(String auditLeaderName) { - this.auditLeaderName = auditLeaderName; - } - - public String getAuditLeaderIdentity() { - return auditLeaderIdentity; - } - - public void setAuditLeaderIdentity(String auditLeaderIdentity) { - this.auditLeaderIdentity = auditLeaderIdentity; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - public String getDefaultLeader() { - return defaultLeader; - } - - public void setDefaultLeader(String defaultLeader) { - this.defaultLeader = defaultLeader; - } - - public String getDefaultLeaderIdentity() { - return defaultLeaderIdentity; - } - - public void setDefaultLeaderIdentity(String defaultLeaderIdentity) { - this.defaultLeaderIdentity = defaultLeaderIdentity; - } - - public String getReportAuditLeaderName() { - return reportAuditLeaderName; - } - - public void setReportAuditLeaderName(String reportAuditLeaderName) { - this.reportAuditLeaderName = reportAuditLeaderName; - } - - public String getReportAuditLeaderIdentity() { - return reportAuditLeaderIdentity; - } - - public void setReportAuditLeaderIdentity(String reportAuditLeaderIdentity) { - this.reportAuditLeaderIdentity = reportAuditLeaderIdentity; - } - - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilter.java deleted file mode 100644 index f2a8033fe6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilter.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkWrapOut; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrCenterWorkInfoList = null; - Long total = 0L; - List processIdentities = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - // 对wrapIn里的信息进行校验 - if (check && okrUserCache.getLoginUserUnitName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - if( id == null || id.isEmpty() ){ - id = "(0)"; - } - if( count == null ){ - count = 12; - } - if( wrapIn == null ){ - wrapIn = new WorkCommonSearchFilter(); - } - - if(check){ - if( !okrUserCache.isOkrManager() ){ - //信息状态要是正常的，已删除的数据不需要查询出来 - wrapIn.addQueryEmployeeIdentities( okrUserCache.getLoginIdentityName() ); - wrapIn.addQueryInfoStatus( "正常" ); - wrapIn.addQueryInfoStatus( "已归档" ); - wrapIn.addQueryProcessIdentity( "观察者" ); - //直接从Person里查询已经分页好的中心工作ID - total = okrCenterWorkQueryService.getCenterCountWithFilter( wrapIn ); - okrCenterWorkInfoList = okrCenterWorkQueryService.listCenterNextWithFilter( id, count, wrapIn ); - }else{ - //如果是管理员，则查询所有的数据 - WorkCommonQueryFilter wrapIn_admin = new WorkCommonQueryFilter(); - wrapIn_admin.setDefaultWorkTypes( wrapIn.getWorkTypes() ); - wrapIn_admin.addQueryInfoStatus( "正常" ); - wrapIn_admin.addQueryInfoStatus( "已归档" ); - - wrapIn.addQueryProcessIdentity( "观察者" ); - //从数据库中查询符合条件的对象总数 - total = okrCenterWorkQueryService.getCountWithFilter( wrapIn_admin ); - okrCenterWorkInfoList = okrCenterWorkQueryService.listNextWithFilter( id, count, wrapIn_admin ); - } - } - if(check){ - if( okrCenterWorkInfoList != null && !okrCenterWorkInfoList.isEmpty() ){ - try{ - wraps = Wo.copier.copy( okrCenterWorkInfoList ); - }catch(Exception e){ - Exception exception = new ExceptionCenterWorkWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if(check){ - if( ListTools.isNotEmpty(wraps) ){ - for( Wo wrap : wraps ){ - processIdentities = new ArrayList<>(); - processIdentities.add( "VIEW" ); - if( wrap.getReportAuditLeaderIdentity() != null && !wrap.getReportAuditLeaderIdentity().isEmpty() ){ - if( wrap.getReportAuditLeaderIdentity().indexOf( okrUserCache.getLoginIdentityName() ) > 0 ){ - processIdentities.add("REPORTAUDIT");//汇报审核领导 - } - } - if ( okrWorkProcessIdentityService.isMyDeployCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("DEPLOY");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyReadCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("READ");//判断工作是否由我阅知 - } - List operations = new ActionListOperationWithId().execute( request, effectivePerson, okrUserCache, wrap.getId() ); - wrap.setOperation( operations ); - wrap.setWorkProcessIdentity( processIdentities ); - } - } - result.setCount( total ); - result.setData( wraps ); - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - return result; - } - - public static class Wo { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrCenterWorkInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe( "中心工作ID" ) - private String id = ""; - - @FieldDescribe( "中心标题" ) - private String title = ""; - - @FieldDescribe( "部署者姓名" ) - private String deployerName = ""; - - @FieldDescribe( "部署者身份" ) - private String deployerIdentity = ""; - - @FieldDescribe( "部署者所属组织" ) - private String deployerUnitName = ""; - - @FieldDescribe( "部署者所属顶层组织" ) - private String deployerTopUnitName = ""; - - @FieldDescribe( "审核者姓名" ) - private String auditLeaderName = ""; - - @FieldDescribe( "审核者身份" ) - private String auditLeaderIdentity = ""; - - @FieldDescribe( "中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消" ) - private String processStatus = "草稿"; - - @FieldDescribe( "中心工作默认完成日期-字符串，显示用：yyyy-mm-dd" ) - private String defaultCompleteDateLimitStr = ""; - - @FieldDescribe( "中心工作默认工作类别" ) - private String defaultWorkType = ""; - - @FieldDescribe( "中心工作默认工作级别" ) - private String defaultWorkLevel = ""; - - @FieldDescribe( "中心工作默认阅知领导(可多值，显示用)" ) - private String defaultLeader = ""; - - @FieldDescribe( "中心工作默认阅知领导身份(可多值，计算组织和顶层组织用)" ) - private String defaultLeaderIdentity = ""; - - @FieldDescribe( "工作汇报审批领导(可多值，显示用)" ) - private String reportAuditLeaderName = ""; - - @FieldDescribe( "工作汇报审批领导身份(可多值，计算组织和顶层组织用)" ) - private String reportAuditLeaderIdentity = ""; - - @FieldDescribe( "中心工作是否需要审核" ) - private Boolean isNeedAudit = false; - - @FieldDescribe( "处理状态：正常|已删除" ) - private String status = "正常"; - - @FieldDescribe( "中心工作描述" ) - private String description = ""; - - @FieldDescribe( "工作处理职责身份(多值): VIEW(观察者)|DEPLOY(部署者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)|REPORTAUDIT(汇报审核者)" ) - private List workProcessIdentity = null; - - @FieldDescribe( "用户可以对工作进行的操作(多值):VIEW|EDIT|DELETE" ) - private List operation = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getAuditLeaderName() { - return auditLeaderName; - } - - public void setAuditLeaderName(String auditLeaderName) { - this.auditLeaderName = auditLeaderName; - } - - public String getAuditLeaderIdentity() { - return auditLeaderIdentity; - } - - public void setAuditLeaderIdentity(String auditLeaderIdentity) { - this.auditLeaderIdentity = auditLeaderIdentity; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - public String getDefaultLeader() { - return defaultLeader; - } - - public void setDefaultLeader(String defaultLeader) { - this.defaultLeader = defaultLeader; - } - - public String getDefaultLeaderIdentity() { - return defaultLeaderIdentity; - } - - public void setDefaultLeaderIdentity(String defaultLeaderIdentity) { - this.defaultLeaderIdentity = defaultLeaderIdentity; - } - - public String getReportAuditLeaderName() { - return reportAuditLeaderName; - } - - public void setReportAuditLeaderName(String reportAuditLeaderName) { - this.reportAuditLeaderName = reportAuditLeaderName; - } - - public String getReportAuditLeaderIdentity() { - return reportAuditLeaderIdentity; - } - - public void setReportAuditLeaderIdentity(String reportAuditLeaderIdentity) { - this.reportAuditLeaderIdentity = reportAuditLeaderIdentity; - } - - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilterAdmin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilterAdmin.java deleted file mode 100644 index 2d4b1a760e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListNextWithFilterAdmin.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; - -public class ActionListNextWithFilterAdmin extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilterAdmin.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Boolean check = true; - Wi wrapIn = null; - EffectivePerson currentPerson = this.effectivePerson(request); - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if( !"xadmin".equalsIgnoreCase( currentPerson.getName() )) { - try { - if (!okrUserInfoService.getIsOkrManager(currentPerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(currentPerson.getDistinguishedName(), ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - } - - if (check) { - if (wrapIn == null) { - wrapIn = new Wi(); - } - } - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("title", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("defaultWorkType", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("description", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("processStatus", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("deployerName", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("deployerUnitName", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("deployerTopUnitName", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, false, wrapIn.getOrder()); - } catch (Exception e) { - result.error(e); - logger.error(e, currentPerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListOperationWithId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListOperationWithId.java deleted file mode 100644 index 4d2ea124e2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListOperationWithId.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.service.OkrTaskService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionListOperationWithId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListOperationWithId.class ); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoQueryService = new OkrWorkBaseInfoQueryService(); - private OkrTaskService okrTaskService = new OkrTaskService(); - - /** - * 1、中心工作是否存在 - * 2、中心工作的状态：草稿，已部署， 已归档 - * 3、当前用户在中心工作中的处理身份 - * - * 管理员（系统管理员，顶层组织工作管理员） - * - * 创建具体工作CREATEWORK： - * 导入具体工作IMPORTWORK： - * 1）中心工作不存在的时候（后台不控制） - * 2）已部署，中心工作创建者|部署者 - * 3）已归档，不能导入 - * - * 删除中心工作DELETE： - * 1）草稿状态：创建者|部署者可以删除 - * 2）已部署：不能删除 （管理员可以） - * 3）已归档：不能删除 （管理员可以） - * - * 部署中心工作DEPLOY： - * 1）当前用户在该中心工作下有未部署的工作时，显示部署中心工作 - * - * 归档中心工作ARCHIVE： - * 1）中心工作不是草稿，未归档 - * 2）管理员和部署者|创建者 - * - * 关闭CLOSE：所有人都有 - * - * @param effectivePerson - * @param wrapIn - * @return - * @throws Exception - */ - protected List execute( HttpServletRequest request, EffectivePerson effectivePerson, OkrUserCache okrUserCache, String id ) { - - List operation = new ArrayList<>(); - List okrWorkBaseInfoList = null; - List ids = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - Boolean isTopUnitWorkAdmin = false; - String status = null; - String processStatus = null; - Boolean confirm = true; - - try { - okrCenterWorkInfo = okrCenterWorkQueryService.get( id ); - } catch (Exception e) { - logger.error( e, effectivePerson, request, null); - } - operation.add( "VIEW" ); - //如果中心工作为空 - if( okrCenterWorkInfo == null ){ - operation.add( "CREATEWORK" ); - operation.add( "IMPORTWORK" ); - operation.add( "CLOSE" ); - return operation; - } - - //中心工作不为空 - status = okrCenterWorkInfo.getStatus(); - processStatus = okrCenterWorkInfo.getProcessStatus(); - - try { - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - isTopUnitWorkAdmin = true; - } - } catch (Exception e ) { - logger.error( e, effectivePerson, request, null); - } - - //创建具体工作|导入具体工作 - if( !"已归档".equals( status )){ - if( okrCenterWorkInfo.getDeployerIdentity().equals( okrUserCache.getLoginIdentityName() ) - || okrCenterWorkInfo.getCreatorIdentity().equals( okrUserCache.getLoginIdentityName() ) - ){ - operation.add( "EDIT" ); - operation.add( "CREATEWORK" ); - operation.add( "IMPORTWORK" ); - } - } - - //部署中心工作：当前用户在该中心工作下有未部署[草稿]的工作时，显示部署中心工作 - if( !"已归档".equals( status )){ - try { - ids = okrWorkPersonService.listDistinctWorkIdsByWorkAndIdentity( okrCenterWorkInfo.getId(), null, okrUserCache.getLoginIdentityName(), "部署者", null ); - - if( ids != null && !ids.isEmpty() ){ - okrWorkBaseInfoList = okrWorkBaseInfoQueryService.listByIds(ids); - - if( okrWorkBaseInfoList != null && !okrWorkBaseInfoList.isEmpty() ){ - for( OkrWorkBaseInfo work : okrWorkBaseInfoList ){ - if( work != null && "草稿".equals( work.getWorkProcessStatus() )){ - operation.add( "DEPLOY" ); - confirm = false; - break; - } - } - } - } - } catch (Exception e) { - logger.error( e, effectivePerson, request, null); - } - } - //归档中心工作 - if( !"草稿".equals( processStatus ) && !"已归档".equals( status ) ){ - //如果用户是管理,或者是部署者 - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin || okrUserCache.getLoginIdentityName().equals( okrCenterWorkInfo.getDeployerIdentity() )){ - operation.add( "ARCHIVE" ); - } - } - //删除 - if( "草稿".equals( processStatus )){ - operation.add( "DELETE" ); - }else{ - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){ - operation.add( "DELETE" ); - } - } - if( confirm ){ - //看看用户是否仍有该中心工作的工作确认的待办 - try { - ids = okrTaskService.listIdsByCenterAndPerson( okrCenterWorkInfo.getId(), okrUserCache.getLoginIdentityName(), "中心工作") ; - if( ids != null && !ids.isEmpty() ){ - operation.add( "CONFIRM" ); - } - } catch (Exception e) { - logger.error( e, effectivePerson, request, null); - } - } - operation.add( "CLOSE" ); - return operation; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilter.java deleted file mode 100644 index d5827e7370..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilter.java +++ /dev/null @@ -1,379 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkWrapOut; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionListPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListPrevWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrCenterWorkInfoList = null; - Long total = 0L; - List processIdentities = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - // 对wrapIn里的信息进行校验 - if (check && okrUserCache.getLoginUserUnitName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(exception, effectivePerson, request, null); - } - if( id == null || id.isEmpty() ){ - id = "(0)"; - } - if( count == null ){ - count = 12; - } - if( wrapIn == null ){ - wrapIn = new WorkCommonSearchFilter(); - } - - if(check){ - if( !okrUserCache.isOkrManager() ){ - //信息状态要是正常的，已删除的数据不需要查询出来 - wrapIn.addQueryEmployeeIdentities( okrUserCache.getLoginIdentityName() ); - wrapIn.addQueryInfoStatus( "正常" ); - wrapIn.addQueryInfoStatus( "已归档" ); - //直接从Person里查询已经分页好的中心工作ID - okrCenterWorkInfoList = okrCenterWorkQueryService.listCenterPrevWithFilter( id, count, wrapIn ); - total = okrCenterWorkQueryService.getCenterCountWithFilter( wrapIn ); - }else{ - //如果是管理员，则查询所有的数据 - WorkCommonQueryFilter wrapIn_admin = new WorkCommonQueryFilter(); - wrapIn_admin.setDefaultWorkTypes( wrapIn.getWorkTypes() ); - wrapIn_admin.addQueryInfoStatus( "正常" ); - wrapIn_admin.addQueryInfoStatus( "已归档" ); - okrCenterWorkInfoList = okrCenterWorkQueryService.listPrevWithFilter( id, count, wrapIn_admin ); - //从数据库中查询符合条件的对象总数 - total = okrCenterWorkQueryService.getCountWithFilter( wrapIn_admin ); - } - } - if(check){ - if( okrCenterWorkInfoList != null && !okrCenterWorkInfoList.isEmpty() ){ - try{ - wraps = Wo.copier.copy( okrCenterWorkInfoList ); - }catch(Exception e){ - Exception exception = new ExceptionCenterWorkWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if(check){ - if( ListTools.isNotEmpty(wraps) ){ - for( Wo wrap : wraps ){ - processIdentities = new ArrayList<>(); - processIdentities.add( "VIEW" ); - if( wrap.getReportAuditLeaderIdentity() != null && !wrap.getReportAuditLeaderIdentity().isEmpty() ){ - if( wrap.getReportAuditLeaderIdentity().indexOf( okrUserCache.getLoginIdentityName() ) > 0 ){ - processIdentities.add("REPORTAUDIT");//汇报审核领导 - } - } - if ( okrWorkProcessIdentityService.isMyDeployCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("DEPLOY");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyReadCenter( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - processIdentities.add("READ");//判断工作是否由我阅知 - } - List operations = new ActionListOperationWithId().execute( request, effectivePerson, okrUserCache, wrap.getId() ); - wrap.setOperation( operations ); - wrap.setWorkProcessIdentity( processIdentities ); - } - } - result.setCount( total ); - result.setData( wraps ); - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - - public static class Wo { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrCenterWorkInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe( "中心工作ID" ) - private String id = ""; - - @FieldDescribe( "中心标题" ) - private String title = ""; - - @FieldDescribe( "部署者姓名" ) - private String deployerName = ""; - - @FieldDescribe( "部署者身份" ) - private String deployerIdentity = ""; - - @FieldDescribe( "部署者所属组织" ) - private String deployerUnitName = ""; - - @FieldDescribe( "部署者所属顶层组织" ) - private String deployerTopUnitName = ""; - - @FieldDescribe( "审核者姓名" ) - private String auditLeaderName = ""; - - @FieldDescribe( "审核者身份" ) - private String auditLeaderIdentity = ""; - - @FieldDescribe( "中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消" ) - private String processStatus = "草稿"; - - @FieldDescribe( "中心工作默认完成日期-字符串，显示用：yyyy-mm-dd" ) - private String defaultCompleteDateLimitStr = ""; - - @FieldDescribe( "中心工作默认工作类别" ) - private String defaultWorkType = ""; - - @FieldDescribe( "中心工作默认工作级别" ) - private String defaultWorkLevel = ""; - - @FieldDescribe( "中心工作默认阅知领导(可多值，显示用)" ) - private String defaultLeader = ""; - - @FieldDescribe( "中心工作默认阅知领导身份(可多值，计算组织和顶层组织用)" ) - private String defaultLeaderIdentity = ""; - - @FieldDescribe( "工作汇报审批领导(可多值，显示用)" ) - private String reportAuditLeaderName = ""; - - @FieldDescribe( "工作汇报审批领导身份(可多值，计算组织和顶层组织用)" ) - private String reportAuditLeaderIdentity = ""; - - @FieldDescribe( "中心工作是否需要审核" ) - private Boolean isNeedAudit = false; - - @FieldDescribe( "处理状态：正常|已删除" ) - private String status = "正常"; - - @FieldDescribe( "中心工作描述" ) - private String description = ""; - - @FieldDescribe( "工作处理职责身份(多值): VIEW(观察者)|DEPLOY(部署者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)|REPORTAUDIT(汇报审核者)" ) - private List workProcessIdentity = null; - - @FieldDescribe( "用户可以对工作进行的操作(多值):VIEW|EDIT|DELETE" ) - private List operation = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getAuditLeaderName() { - return auditLeaderName; - } - - public void setAuditLeaderName(String auditLeaderName) { - this.auditLeaderName = auditLeaderName; - } - - public String getAuditLeaderIdentity() { - return auditLeaderIdentity; - } - - public void setAuditLeaderIdentity(String auditLeaderIdentity) { - this.auditLeaderIdentity = auditLeaderIdentity; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - public String getDefaultLeader() { - return defaultLeader; - } - - public void setDefaultLeader(String defaultLeader) { - this.defaultLeader = defaultLeader; - } - - public String getDefaultLeaderIdentity() { - return defaultLeaderIdentity; - } - - public void setDefaultLeaderIdentity(String defaultLeaderIdentity) { - this.defaultLeaderIdentity = defaultLeaderIdentity; - } - - public String getReportAuditLeaderName() { - return reportAuditLeaderName; - } - - public void setReportAuditLeaderName(String reportAuditLeaderName) { - this.reportAuditLeaderName = reportAuditLeaderName; - } - - public String getReportAuditLeaderIdentity() { - return reportAuditLeaderIdentity; - } - - public void setReportAuditLeaderIdentity(String reportAuditLeaderIdentity) { - this.reportAuditLeaderIdentity = reportAuditLeaderIdentity; - } - - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilterAdmin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilterAdmin.java deleted file mode 100644 index 119f5d80d9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionListPrevWithFilterAdmin.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrauthorize.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionOkrSystemAdminCheck; - -public class ActionListPrevWithFilterAdmin extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListPrevWithFilterAdmin.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Boolean check = true; - Wi wrapIn = null; - EffectivePerson currentPerson = this.effectivePerson(request); - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - if (!okrUserInfoService.getIsOkrManager(currentPerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(currentPerson.getDistinguishedName(), - ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - - if (check) { - if (wrapIn == null) { - wrapIn = new Wi(); - } - } - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("title", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("defaultWorkType", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("description", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("processStatus", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("deployerName", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("deployerUnitName", wrapIn.getFilterLikeContent()); - } - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("deployerTopUnitName", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListPrev(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, false, wrapIn.getOrder()); - } catch (Exception e) { - result.error(e); - logger.error(e, currentPerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionSave.java deleted file mode 100644 index d851287230..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/ActionSave.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkAuditLeaderEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkSave; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCenterWorkTitleEmpty; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionCompleteDateLimitFormat; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionUserUnitQuery; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - Wo wrapOutId = null; - Boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - okrUserCache = checkUserLogin( effectivePerson.getDistinguishedName() ); - if( okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - if( wrapIn.getTitle() == null || wrapIn.getTitle().isEmpty() ){ - check = false; - Exception exception = new ExceptionCenterWorkTitleEmpty(); - result.error( exception ); - } - } - - if( check ){ - if( wrapIn.getTitle().length() > 70 ){ - check = false; - Exception exception = new ExceptionCenterWorkTitleEmpty(); - result.error( exception ); - } - } - - if( check ){ - okrCenterWorkInfo = Wi.copier.copy( wrapIn ); - okrCenterWorkInfo.setId( wrapIn.getId() ); - okrCenterWorkInfo.setProcessStatus( "草稿" ); - okrCenterWorkInfo.setDeployerName( okrUserCache.getLoginUserName() ); - okrCenterWorkInfo.setDeployerUnitName( okrUserCache.getLoginUserUnitName()); - okrCenterWorkInfo.setDeployerTopUnitName( okrUserCache.getLoginUserTopUnitName()); - okrCenterWorkInfo.setDeployerIdentity( okrUserCache.getLoginIdentityName() ); - if( effectivePerson.getDistinguishedName().equals( okrUserCache.getLoginUserName())){ - okrCenterWorkInfo.setCreatorName( effectivePerson.getDistinguishedName() ); - okrCenterWorkInfo.setCreatorUnitName( okrUserCache.getLoginUserUnitName()); - okrCenterWorkInfo.setCreatorTopUnitName( okrUserCache.getLoginUserTopUnitName()); - okrCenterWorkInfo.setCreatorIdentity( okrUserCache.getLoginIdentityName() ); - }else{ - try{ - //需要查询创建者的相关身份 - wrapIn.setCreatorIdentity( okrUserManagerService.getIdentityWithPerson( effectivePerson.getDistinguishedName() )); - wrapIn.setCreatorUnitName( okrUserManagerService.getUnitNameByIdentity( wrapIn.getCreatorIdentity() )); - wrapIn.setCreatorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( wrapIn.getCreatorIdentity() ) ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionUserUnitQuery( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - //补充部署工作的年份和月份 - if( check ){ - try{ - okrCenterWorkInfo.setDeployYear( dateOperation.getYear( new Date() )); - okrCenterWorkInfo.setDeployMonth( dateOperation.getMonth( new Date() )); - }catch( Exception e ){ - check = false; - result.error( e ); - logger.warn( "system get now date for year and month got an exception." ); - logger.error( e, effectivePerson, request, null); - } - } - - //补充部署工作的默认最迟完成年份的日期形式 - if( check ){ - if( okrCenterWorkInfo.getDefaultCompleteDateLimitStr() != null && !okrCenterWorkInfo.getDefaultCompleteDateLimitStr().isEmpty() ){ - String date = null; - try{ - date = dateOperation.getDateStringFromDate( dateOperation.getDateFromString ( wrapIn.getDefaultCompleteDateLimitStr()), "yyyy-MM-dd" ) + " 23:59:59"; - okrCenterWorkInfo.setDefaultCompleteDateLimit( dateOperation.getDateFromString( date ) ); - }catch( Exception e ){ - check = false; - Exception exception = new ExceptionCompleteDateLimitFormat( e, okrCenterWorkInfo.getDefaultCompleteDateLimitStr() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - //中心工作部署后，根据需求，有的需要进行审批后才能继续部署，如果需要审批，那么isNeedAudit值为true，并且auditLeaderName不可为空。 - if( check ){ - if( okrCenterWorkInfo.getIsNeedAudit() && ListTools.isEmpty(okrCenterWorkInfo.getReportAuditLeaderIdentityList())){ - check = false; - Exception exception = new ExceptionCenterWorkAuditLeaderEmpty(); - result.error( exception ); - }else { - List identities = new ArrayList<>(); - List names = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - for( String _identity : okrCenterWorkInfo.getReportAuditLeaderIdentityList() ) { - String _name = userManagerService.getPersonNameByIdentity(_identity); - String _unitName = userManagerService.getUnitNameByIdentity(_identity); - String _topUnitName = userManagerService.getTopUnitNameByIdentity(_identity); - identities.add( _identity ); - names.add( _name ); - unitNames.add( _unitName ); - topUnitNames.add( _topUnitName ); - } - okrCenterWorkInfo.setReportAuditLeaderIdentityList(identities); - okrCenterWorkInfo.setReportAuditLeaderNameList(names); - okrCenterWorkInfo.setReportAuditLeaderUnitNameList(unitNames); - okrCenterWorkInfo.setReportAuditLeaderTopUnitNameList(topUnitNames); - } - } - //开始保存中心工作信息 - if( check ){ - try { - okrCenterWorkInfo = okrCenterWorkOperationService.save( okrCenterWorkInfo ); - Wo wo = new Wo(); - wo.setId( okrCenterWorkInfo.getId() ); - result.setData( wo ); - result.setData( wrapOutId ); - if( okrCenterWorkInfo != null ) { - WrapInWorkDynamic.sendWithCenterWorkInfo( - okrCenterWorkInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "保存中心工作", - "中心工作保存成功！" - ); - } - } catch (Exception e) { - Exception exception = new ExceptionCenterWorkSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrCenterWorkInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - public static WrapCopier copier = WrapCopierFactory.wi( Wi.class, OkrCenterWorkInfo.class, null, JpaObject.FieldsUnmodify); - - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/BaseAction.java deleted file mode 100644 index c5755eeddc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/BaseAction.java +++ /dev/null @@ -1,339 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.service.OkrCenterWorkOperationService; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrConfigWorkTypeService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.assemble.control.service.OkrWorkPersonSearchService; -import com.x.okr.assemble.control.service.OkrWorkProcessIdentityService; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class BaseAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(BaseAction.class); - - protected OkrUserManagerService userManagerService = new OkrUserManagerService(); - protected OkrWorkProcessIdentityService okrWorkProcessIdentityService = new OkrWorkProcessIdentityService(); - protected OkrCenterWorkQueryService okrCenterWorkQueryService = new OkrCenterWorkQueryService(); - protected OkrWorkPersonSearchService okrWorkPersonSearchService = new OkrWorkPersonSearchService(); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - protected OkrConfigWorkTypeService okrConfigWorkTypeService = new OkrConfigWorkTypeService(); - protected DateOperation dateOperation = new DateOperation(); - protected OkrCenterWorkOperationService okrCenterWorkOperationService = new OkrCenterWorkOperationService(); - - protected OkrUserCache checkUserLogin(String name) { - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(name); - } catch (Exception e) { - logger.warn("system get login indentity with person name got an exception"); - logger.error(e); - return null; - } - if (okrUserCache == null || okrUserCache.getLoginIdentityName() == null) { - return null; - } - if (okrUserCache.getLoginUserName() == null) { - return null; - } - if (okrUserCache.getLoginUserUnitName() == null) { - return null; - } - if (okrUserCache.getLoginUserTopUnitName() == null) { - return null; - } - return okrUserCache; - } - - public static class Wo extends OkrCenterWorkInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrCenterWorkInfo.class, Wo.class, - null, Wo.Excludes); - - @FieldDescribe("所有的工作列表") - private List works = null; - - @FieldDescribe("所有的工作类别列表") - private List workTypes = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):CREATEWORK|IMPORTWORK|DEPLOY|ARCHIVE|CLOSE|DELETE") - private List operation = null; - - @FieldDescribe("是否为新创建的草稿信息") - private Boolean isNew = true; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getWorks() { - return works; - } - - public void setWorks(List works) { - this.works = works; - } - - public List getWorkTypes() { - return workTypes; - } - - public void setWorkTypes(List workTypes) { - this.workTypes = workTypes; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - public Boolean getIsNew() { - return isNew; - } - - public void setIsNew(Boolean isNew) { - this.isNew = isNew; - } - - } - - public static class WoOkrWorkBaseInfo extends OkrWorkBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - private List subWrapOutOkrWorkBaseInfos = null; - private List okrWorkAuthorizeRecords = null; - private WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - private String workOutType = "SUBWORK"; - private String workDetail = null; - private String dutyDescription = null; - private String landmarkDescription = null; - private String majorIssuesDescription = null; - private String progressAction = null; - private String progressPlan = null; - private String resultDescription = null; - private Boolean hasNoneSubmitReport = false; - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getSubWrapOutOkrWorkBaseInfos() { - return subWrapOutOkrWorkBaseInfos; - } - - public void setSubWrapOutOkrWorkBaseInfos(List subWrapOutOkrWorkBaseInfos) { - this.subWrapOutOkrWorkBaseInfos = subWrapOutOkrWorkBaseInfos; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseInfo workBaseInfo) { - if (this.subWrapOutOkrWorkBaseInfos == null) { - this.subWrapOutOkrWorkBaseInfos = new ArrayList(); - } - if (!subWrapOutOkrWorkBaseInfos.contains(workBaseInfo)) { - subWrapOutOkrWorkBaseInfos.add(workBaseInfo); - } - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - /** - * 判断是父级工作还是子工作 - * - * @return - */ - public String getWorkOutType() { - return workOutType; - } - - /** - * 判断是父级工作还是子工作 - * - * @param workOutType - */ - public void setWorkOutType(String workOutType) { - this.workOutType = workOutType; - } - - public List getOkrWorkAuthorizeRecords() { - return okrWorkAuthorizeRecords; - } - - public void setOkrWorkAuthorizeRecords(List okrWorkAuthorizeRecords) { - this.okrWorkAuthorizeRecords = okrWorkAuthorizeRecords; - } - - public WoOkrWorkAuthorizeRecord getOkrWorkAuthorizeRecord() { - return okrWorkAuthorizeRecord; - } - - public void setOkrWorkAuthorizeRecord(WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord) { - this.okrWorkAuthorizeRecord = okrWorkAuthorizeRecord; - } - - public Boolean getHasNoneSubmitReport() { - return hasNoneSubmitReport; - } - - public void setHasNoneSubmitReport(Boolean hasNoneSubmitReport) { - this.hasNoneSubmitReport = hasNoneSubmitReport; - } - - } - - public static class WoOkrWorkAuthorizeRecord extends OkrWorkAuthorizeRecord { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } - - public static class WoOkrWorkType { - - @FieldDescribe("工作类别ID") - private String id = null; - - @FieldDescribe("工作类别名称") - private String workTypeName = null; - - @FieldDescribe("工作类别排序号") - private Integer orderNumber = null; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public WoOkrWorkType() { - - } - - public WoOkrWorkType(String id, String name, Integer orderNumber) { - this.id = id; - this.workTypeName = name; - this.orderNumber = orderNumber; - } - - public String getWorkTypeName() { - return workTypeName; - } - - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - - public Integer getOrderNumber() { - return orderNumber; - } - - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAction.java deleted file mode 100644 index 74d30d0159..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAction.java +++ /dev/null @@ -1,623 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionWrapInConvert; - -@Path("okrcenterworkinfo") -@JaxrsDescribe("中心工作管理服务") -public class OkrCenterWorkInfoAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrCenterWorkInfoAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新中心工作信息对象", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取中心工作信息对象", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "创建中心工作草稿, 未保存", action = ActionDraftNewCenter.class) - @GET - @Path("draft") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void draftNew(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDraftNewCenter().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除中心工作数据对象", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID归档中心工作数据对象", action = ActionArchive.class) - @GET - @Path("archive/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void archive(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionArchive().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "中心工作正式部署服务", action = ActionDeploy.class) - @GET - @Path("deploy/{centerId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void deploy(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("centerId") String centerId) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDeploy().execute(request, effectivePerson, centerId); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[草稿],下一页", action = ActionListByProcessIdentityNextWithFilter.class) - @PUT - @Path("draft/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listDraftNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setWorkProcessStatuses(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("正常"); - wrapIn.addQueryWorkProcessStatus("草稿"); - wrapIn.addQueryProcessIdentity("部署者"); - result = new ActionListByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[草稿],上一页", action = ActionListByProcessIdentityPrevWithFilter.class) - @PUT - @Path("draft/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listDraftPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setWorkProcessStatuses(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("正常"); - wrapIn.addQueryWorkProcessStatus("草稿"); - wrapIn.addQueryProcessIdentity("部署者"); - result = new ActionListByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[部署的],下一页", action = ActionListByProcessIdentityNextWithFilter.class) - @PUT - @Path("deployed/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDeployedNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[部署的],上一页", action = ActionListByProcessIdentityPrevWithFilter.class) - @PUT - @Path("deployed/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDeployedPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[我可以阅知的],下一页", action = ActionListByProcessIdentityNextWithFilter.class) - @PUT - @Path("read/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyReadNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[我可以阅知的],上一页", action = ActionListByProcessIdentityPrevWithFilter.class) - @PUT - @Path("read/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyReadPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[已归档],下一页", action = ActionListByProcessIdentityNextWithFilter.class) - @PUT - @Path("archive/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyArchiveNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("已归档"); - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的中心工作[已归档],上一页", action = ActionListByProcessIdentityPrevWithFilter.class) - @PUT - @Path("archive/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyArchivePrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setProcessIdentities(null); - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.addQueryInfoStatus("已归档"); - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, count, - wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件的中心工作,下一页", action = ActionListNextWithFilter.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listNextWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件的中心工作,上一页", action = ActionListPrevWithFilter.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listPrevWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAdminAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAdminAction.java deleted file mode 100644 index 14030c5ed6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/OkrCenterWorkInfoAdminAction.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("admin/okrcenterworkinfo") -@JaxrsDescribe("中心工作数据管理服务") -public class OkrCenterWorkInfoAdminAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrCenterWorkInfoAdminAction.class); - - @JaxrsMethodDescribe(value = "根据ID删除中心工作数据对象", action = ActionDeleteAdmin.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson( request ); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDeleteAdmin().execute( request, effectivePerson, id ); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error( e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取中心工作数据对象", action = ActionGetAdmin.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson( request ); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGetAdmin().execute( request, effectivePerson, id ); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error( e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的中心工作数据对象,下一页", action = ActionListNextWithFilterAdmin.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListNextWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam( "id" ) String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam( "count" ) Integer count, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson( request ); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListNextWithFilterAdmin().execute( request, effectivePerson, id, count, jsonElement ); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error( e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的中心工作数据对象,上一页", action = ActionListPrevWithFilterAdmin.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam( "id" ) String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam( "count" ) Integer count, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson( request ); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListPrevWithFilterAdmin().execute( request, effectivePerson, id, count, jsonElement ); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error( e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkArchive.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkArchive.java deleted file mode 100644 index dd51f7cf73..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkArchive.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkArchive extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkArchive( Throwable e, String id ) { - super("中心工作归档操作过程中发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkAuditLeaderEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkAuditLeaderEmpty.java deleted file mode 100644 index d65fc443df..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkAuditLeaderEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkAuditLeaderEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkAuditLeaderEmpty() { - super("中心工作需要审核，但是审核领导信息为空，请检查输入的信息内容。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDelete.java deleted file mode 100644 index c61abcb9e5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkDelete( Throwable e, String id ) { - super("中心工作删除操作过程中发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDeploy.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDeploy.java deleted file mode 100644 index 4bf9d51331..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkDeploy.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkDeploy extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkDeploy( Throwable e, String id ) { - super("中心工作部署操作过程中发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkIdEmpty.java deleted file mode 100644 index 7341e2f27c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkIdEmpty() { - super("id为空，无法继续进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkListFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkListFilter.java deleted file mode 100644 index d1e30c608e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkListFilter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkListFilter extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkListFilter( Throwable e, String id, Integer count) { - super("分页搜索中心工作信息时发生异常。Id:" + id + ", Count:" + count, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkNotExists.java deleted file mode 100644 index 544e5b91cb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkNotExists( String id ) { - super("指定的中心工作信息不存在。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkQueryById.java deleted file mode 100644 index 939f1badc2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkQueryById( Throwable e, String id ) { - super("根据ID查询中心工作信息时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkSave.java deleted file mode 100644 index 22d6b5291c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkSave( Throwable e ) { - super("中心工作信息保存时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleEmpty.java deleted file mode 100644 index 3c54ba6027..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkTitleEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkTitleEmpty() { - super("中心工作[标题]过长,请限制为70个汉字。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleLengthInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleLengthInvalid.java deleted file mode 100644 index 8fb433935a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkTitleLengthInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkTitleLengthInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkTitleLengthInvalid() { - super("中心工作标题为空，无法继续进行保存操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapIn.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapIn.java deleted file mode 100644 index 4e39356718..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapIn.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkWrapIn extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkWrapIn( Throwable e ) { - super("将用户传入的数据转换为一个中心工作对象信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapOut.java deleted file mode 100644 index eed0ec2d7b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCenterWorkWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkWrapOut( Throwable e ) { - super("将中心工作查询结果转换为可以输出的数据信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCompleteDateLimitFormat.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCompleteDateLimitFormat.java deleted file mode 100644 index de78459ee8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionCompleteDateLimitFormat.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCompleteDateLimitFormat extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCompleteDateLimitFormat( Throwable e, String date ) { - super("默认完成时限日期格式不正确，要求格式为：yyyy-mm-dd! Date:'" + date +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionDeployableWorkQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionDeployableWorkQuery.java deleted file mode 100644 index 346bf80258..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionDeployableWorkQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionDeployableWorkQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionDeployableWorkQuery( Throwable e, String centerId, String person ) { - super("系统根据条件查询用户需要进行部署的工作信息列表时发生异常。CenterId:" + centerId + ", Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 60190d2d00..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionInsufficientPermissions.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionInsufficientPermissions.java deleted file mode 100644 index acf845149e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionInsufficientPermissions.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionInsufficientPermissions extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionInsufficientPermissions( String name, String role ) { - super("操作权限不足。Name:" + name + ", Role:" + role ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrOperationDynamicSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrOperationDynamicSave.java deleted file mode 100644 index b0f1541da4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrOperationDynamicSave.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOkrOperationDynamicSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOkrOperationDynamicSave( Throwable e, String id ) { - super("系统在保存中心工作操作动态信息时发生异常。ID:" + id, e ); - } - - public ExceptionOkrOperationDynamicSave( Throwable e ) { - super("系统在保存中心工作操作动态信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrSystemAdminCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrSystemAdminCheck.java deleted file mode 100644 index 4e86bd2bbf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionOkrSystemAdminCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOkrSystemAdminCheck extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOkrSystemAdminCheck( Throwable e, String userName ) { - super("系统在判断用户是否是OKR系统管理员时发生异常.Name:" + userName, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionSystemWorkManagerCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionSystemWorkManagerCheck.java deleted file mode 100644 index bb4ba424be..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionSystemWorkManagerCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemWorkManagerCheck extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemWorkManagerCheck( Throwable e, String person ) { - super("检查用户是否顶层组织管理员过程中发生异常。Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 0bcd26ae73..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserUnitQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserUnitQuery.java deleted file mode 100644 index 411b7f73d2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionUserUnitQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserUnitQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserUnitQuery( Throwable e, String userName ) { - super("系统通过操作用户查询用户身份和组织信息时发生异常!Person:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkDeploy.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkDeploy.java deleted file mode 100644 index d2fba056ca..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkDeploy.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDeploy extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDeploy( Throwable e ) { - super("工作部署操作过程中发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkPersonQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkPersonQuery.java deleted file mode 100644 index 26dab62a60..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkPersonQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkPersonQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkPersonQuery( Throwable e, String person, String processIdentity ) { - super("根据用户身份份和在工作中的处理身份查询工作干系人信息列表时发生异常。Person:" + person + ", ProcessIdentity:" + processIdentity, e ); - } - - public ExceptionWorkPersonQuery( Throwable e, String centerId, String person, String processIdentity ) { - super("根据用户身份份和在工作中的处理身份查询工作干系人信息列表时发生异常。CenterId: "+ centerId +", Person:" + person + ", ProcessIdentity:" + processIdentity, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskCreate.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskCreate.java deleted file mode 100644 index 11ffa66350..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskCreate.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTaskCreate extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTaskCreate( Throwable e ) { - super("工作部署待办生成过程中发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskQuery.java deleted file mode 100644 index 7ed4355665..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTaskQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTaskQuery( Throwable e, String centerId, String person, String taskObjectType ) { - super("根据用户身份份和在工作中的处理身份查询工作干系人信息列表时发生异常。CenterId: "+ centerId +", Person:" + person + ", TaskObjectType:" + taskObjectType, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskRemove.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskRemove.java deleted file mode 100644 index 3e4dd6ed86..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWorkTaskRemove.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTaskRemove extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTaskRemove( Throwable e ) { - super("工作部署待办删除过程中发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWrapInConvert.java deleted file mode 100644 index bb727c8f4f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrcenterworkinfo/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionDelete.java deleted file mode 100644 index 3cb20315da..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionDelete.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigDelete; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigQueryById; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigSecretary; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrConfigSecretary okrConfigSecretary = null; - OkrUserCache okrUserCache = null; - Boolean check = true; - - if( check ){ - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionSercretaryConfigIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - try{ - okrConfigSecretary = okrConfigSecretaryService.get( id ); - if( okrConfigSecretary == null ){ - check = false; - Exception exception = new ExceptionSercretaryConfigNotExists( id ); - result.error( exception ); - } - }catch(Exception e){ - Exception exception = new ExceptionSercretaryConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrConfigSecretaryService.delete( id ); - - Wo wo = new Wo(); - wo.setId( id ); - result.setData( wo ); - - WrapInWorkDynamic.sendWithSecretaryConfig( - okrConfigSecretary, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "删除领导秘书配置", - "删除领导秘书配置成功！" - ); - - ApplicationCache.notify( OkrConfigSecretary.class ); - }catch(Exception e){ - Exception exception = new ExceptionSercretaryConfigDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionGet.java deleted file mode 100644 index d321c2b458..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionGet.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigQueryById; -import com.x.okr.entity.OkrConfigSecretary; - -import net.sf.ehcache.Element; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrConfigSecretary okrConfigSecretary = null; - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionSercretaryConfigIdEmpty(); - result.error( exception ); - }else{ - String cacheKey = catchNamePrefix + "." + id; - Element element = null; - element = cache.get( cacheKey ); - if( element != null ){ - wrap = ( Wo ) element.getObjectValue(); - result.setData( wrap ); - }else{ - try { - okrConfigSecretary = okrConfigSecretaryService.get( id ); - if( okrConfigSecretary != null ){ - wrap = Wo.copier.copy( okrConfigSecretary ); - cache.put( new Element( cacheKey, wrap ) ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionSercretaryConfigNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionSercretaryConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - return result; - } - - public static class Wo extends OkrConfigSecretary { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigSecretary.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListMySercretary.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListMySercretary.java deleted file mode 100644 index 06d0b132a0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListMySercretary.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigListByIds; -import com.x.okr.entity.OkrConfigSecretary; - -import net.sf.ehcache.Element; - -public class ActionListMySercretary extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMySercretary.class ); - - @SuppressWarnings("unchecked") - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult> result = new ActionResult>(); - List wraps = null; - List ids = null; - List okrConfigSecretaryList = null; - String cacheKey = catchNamePrefix + "." + effectivePerson.getDistinguishedName(); - Element element = null; - - element = cache.get( cacheKey ); - if( element != null ){ - wraps = (List) element.getObjectValue(); - result.setData( wraps ); - }else{ - try { - ids = okrConfigSecretaryService.listIdsByPerson( effectivePerson.getDistinguishedName() ); - if( ListTools.isNotEmpty( ids ) ){ - okrConfigSecretaryList = okrConfigSecretaryService.listByIds( ids ); - } - if( okrConfigSecretaryList != null ){ - wraps = Wo.copier.copy( okrConfigSecretaryList ); - cache.put( new Element( cacheKey, wraps ) ); - result.setData( wraps ); - } - } catch (Exception e) { - Exception exception = new ExceptionSercretaryConfigListByIds( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrConfigSecretary { - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigSecretary.class, Wo.class, null,JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListNextWithFilter.java deleted file mode 100644 index fa8cf03b4c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListNextWithFilter.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrConfigSecretary; - -public class ActionListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (id == null || id.isEmpty()) { - id = "(0)"; - } - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - - try { - result = this.standardListNext(Wo.copier, id, count, wrapIn.getSequenceField(), equalsMap, notEqualsMap, - likesMap, insMap, notInsMap, membersMap, notMembersMap, null, wrapIn.isAndJoin(), - wrapIn.getOrder()); - } catch (Exception e) { - result.error(e); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于查询的秘书姓名.") - private String secretaryName = null; - - @FieldDescribe("用于查询的领导姓名.") - private String leaderName = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Integer count; - - private boolean andJoin; - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public boolean isAndJoin() { - return andJoin; - } - - public void setAndJoin(boolean andJoin) { - this.andJoin = andJoin; - } - - public String getSecretaryName() { - return secretaryName; - } - - public void setSecretaryName(String secretaryName) { - this.secretaryName = secretaryName; - } - - public String getLeaderName() { - return leaderName; - } - - public void setLeaderName(String leaderName) { - this.leaderName = leaderName; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - } - - public static class Wo extends OkrConfigSecretary { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrConfigSecretary.class, - Wo.class, null, Wo.Excludes); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListPrevWithFilter.java deleted file mode 100644 index 528e1cde99..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionListPrevWithFilter.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrConfigSecretary; - -public class ActionListPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListPrevWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (id == null || id.isEmpty()) { - id = "(0)"; - } - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - - try { - result = this.standardListPrev(Wo.copier, id, count, wrapIn.getSequenceField(), equalsMap, notEqualsMap, - likesMap, insMap, notInsMap, membersMap, notMembersMap, null, wrapIn.isAndJoin(), - wrapIn.getOrder()); - } catch (Exception e) { - result.error(e); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于查询的秘书姓名.") - private String secretaryName = null; - - @FieldDescribe("用于查询的领导姓名.") - private String leaderName = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Integer count; - - private boolean andJoin; - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public boolean isAndJoin() { - return andJoin; - } - - public void setAndJoin(boolean andJoin) { - this.andJoin = andJoin; - } - - public String getSecretaryName() { - return secretaryName; - } - - public void setSecretaryName(String secretaryName) { - this.secretaryName = secretaryName; - } - - public String getLeaderName() { - return leaderName; - } - - public void setLeaderName(String leaderName) { - this.leaderName = leaderName; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - } - - public static class Wo extends OkrConfigSecretary { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrConfigSecretary.class, - Wo.class, null, Wo.Excludes); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionSave.java deleted file mode 100644 index 3840769594..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/ActionSave.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionGetTopUnitNameByIdentity; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionGetUnitNameByIdentity; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigProcess; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionSercretaryConfigSave; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigSecretary; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrConfigSecretary okrConfigSecretary = null; - Boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check && wrapIn != null ){ - if( check ){ - if( wrapIn.getLeaderIdentity() != null && !wrapIn.getLeaderIdentity().isEmpty() ){ - wrapIn.setLeaderName( okrUserManagerService.getPersonNameByIdentity( wrapIn.getLeaderIdentity() ) ); - if( wrapIn.getLeaderName() == null ) { - check = false; - Exception exception = new ExceptionSercretaryConfigProcess( "根据身份未能查询到领导个人信息！身份：" + wrapIn.getLeaderIdentity()); - result.error( exception ); - } - }else { - check = false; - Exception exception = new ExceptionSercretaryConfigProcess( "领导身份属性为空！" ); - result.error( exception ); - } - if( wrapIn.getSecretaryIdentity() != null && !wrapIn.getSecretaryIdentity().isEmpty() ){ - wrapIn.setSecretaryName( okrUserManagerService.getPersonNameByIdentity( wrapIn.getSecretaryIdentity() ) ); - if( wrapIn.getSecretaryName() == null ) { - check = false; - Exception exception = new ExceptionSercretaryConfigProcess( "根据身份未能查询到秘书个人信息！身份：" + wrapIn.getSecretaryIdentity()); - result.error( exception ); - } - }else { - check = false; - Exception exception = new ExceptionSercretaryConfigProcess( "秘书身份属性为空！" ); - result.error( exception ); - } - } - if( check ){ - //补充代理领导所属组织名称和顶层组织名称 - try { - wrapIn.setLeaderUnitName( okrUserManagerService.getUnitNameByIdentity( wrapIn.getLeaderIdentity() ) ); - } catch (Exception e) { - Exception exception = new ExceptionGetUnitNameByIdentity( e, wrapIn.getLeaderIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - try { - wrapIn.setLeaderTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( wrapIn.getLeaderIdentity() ) ); - } catch (Exception e) { - Exception exception = new ExceptionGetTopUnitNameByIdentity( e, wrapIn.getLeaderIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - //补充代理领导所属组织名称和顶层组织名称 - try { - wrapIn.setSecretaryUnitName( okrUserManagerService.getUnitNameByIdentity( wrapIn.getSecretaryIdentity() ) ); - } catch (Exception e) { - Exception exception = new ExceptionGetUnitNameByIdentity( e, wrapIn.getSecretaryIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - try { - wrapIn.setSecretaryTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( wrapIn.getSecretaryIdentity() ) ); - } catch (Exception e) { - Exception exception = new ExceptionGetTopUnitNameByIdentity( e, wrapIn.getSecretaryIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrConfigSecretary = okrConfigSecretaryService.save( wrapIn ); - - Wo wo = new Wo(); - wo.setId( okrConfigSecretary.getId() ); - result.setData( wo ); - - if( okrConfigSecretary != null ) { - WrapInWorkDynamic.sendWithSecretaryConfig( - okrConfigSecretary, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "保存领导秘书配置", - "保存领导秘书配置成功！" - ); - } - ApplicationCache.notify( OkrConfigSecretary.class ); - } catch (Exception e) { - Exception exception = new ExceptionSercretaryConfigSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - return result; - } - - public static class Wi extends OkrConfigSecretary { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - private String userName = null; - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - } - - public static class Wo extends WoId { - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/BaseAction.java deleted file mode 100644 index 2e70b22ae9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/BaseAction.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrConfigSecretaryService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.entity.OkrConfigSecretary; - -import net.sf.ehcache.Ehcache; - -public class BaseAction extends StandardJaxrsAction { - protected OkrConfigSecretaryService okrConfigSecretaryService = new OkrConfigSecretaryService(); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected Ehcache cache = ApplicationCache.instance().getCache( OkrConfigSecretary.class ); - protected String catchNamePrefix = this.getClass().getName(); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/OkrConfigSecretaryAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/OkrConfigSecretaryAction.java deleted file mode 100644 index b819e159c9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/OkrConfigSecretaryAction.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrconfigsecretary") -@JaxrsDescribe("领导秘书配置管理服务") -public class OkrConfigSecretaryAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrConfigSecretaryAction.class); - - @JaxrsMethodDescribe(value = "根据登录的用户姓名获取相应的秘书配置列表", action = ActionListMySercretary.class) - @GET - @Path("list/my") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMySercretary(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMySercretary().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "新建或者更新具体领导秘书配置信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除具体领导秘书配置信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("秘书配置信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取具体领导秘书配置信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("秘书配置信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件的领导秘书配置信息,下一页", action = ActionListNextWithFilter.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listNextWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件的领导秘书配置信息,上一页", action = ActionListPrevWithFilter.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listPrevWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 5ee0b15b85..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetTopUnitNameByIdentity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetTopUnitNameByIdentity.java deleted file mode 100644 index 36f8b126cc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetTopUnitNameByIdentity.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetTopUnitNameByIdentity extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetTopUnitNameByIdentity( Throwable e, String identity ) { - super("根据用户身份查询所属顶层组织名称发生异常。Identity:" + identity, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetUnitNameByIdentity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetUnitNameByIdentity.java deleted file mode 100644 index c1cf6f0b44..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionGetUnitNameByIdentity.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetUnitNameByIdentity extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetUnitNameByIdentity( Throwable e, String identity ) { - super("根据用户身份查询所属组织名称发生异常。Identity:" + identity, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigDelete.java deleted file mode 100644 index fd03cec161..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigDelete( Throwable e, String id ) { - super("id为空，无法继续进行查询操作。ID:"+id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigIdEmpty.java deleted file mode 100644 index 2e050f7068..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigIdEmpty() { - super("id为空，无法继续进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigLeaderIdentityEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigLeaderIdentityEmpty.java deleted file mode 100644 index e6a9a15920..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigLeaderIdentityEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigLeaderIdentityEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigLeaderIdentityEmpty() { - super("代理领导身份为空，无法继续进行查询或者保存操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigListByIds.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigListByIds.java deleted file mode 100644 index e1119b7d32..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigListByIds.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigListByIds extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigListByIds( Throwable e ) { - super("系统根据ID列表查询领导秘书配置信息时发生异常。", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigNotExists.java deleted file mode 100644 index cfdf454f20..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigNotExists( String id ) { - super("指定ID的领导秘书配置信息不存在。ID:"+id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigProcess.java deleted file mode 100644 index 79e6217dde..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigProcess.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigProcess( String message ) { - super( message ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigQueryById.java deleted file mode 100644 index 930d1d5422..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigQueryById( Throwable e, String id ) { - super("系统根据ID查询领导秘书配置信息时发生异常。ID:"+id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigSave.java deleted file mode 100644 index 5efaeb9e44..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionSercretaryConfigSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSercretaryConfigSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSercretaryConfigSave( Throwable e ) { - super("保存领导秘书配置信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 80bab0be9a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionWrapInConvert.java deleted file mode 100644 index f2abc040d4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsercretary/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionAllowedDeployWork.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionAllowedDeployWork.java deleted file mode 100644 index 02a682f880..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionAllowedDeployWork.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; - -public class ActionAllowedDeployWork extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionAllowedDeployWork.class ); - - /** - * 1、如果系统配置设置为所有人可以部署工作(系统配置 TOPUNIT_WORK_ADMIN 为空),那么返回true - * 2、如果系统配置设置为指定人可以部署工作(系统配置 TOPUNIT_WORK_ADMIN 不为空), - * 3、系统管理员可以部署（ 用户拥有角色 : OkrSystemAdmin ） - * @param effectivePerson - * @return - * @throws Exception - */ - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - WrapOutBoolean wrapOutBoolean = new WrapOutBoolean(); - OkrUserCache okrUserCache = null; - String configValue = null; - boolean iCanDeploy = false; - - //1、如果用户是系统管理员,那么用户可以部署 - iCanDeploy = okrUserInfoService.getIsOkrManager( effectivePerson.getDistinguishedName() ); - - if( !iCanDeploy ){ - //获取系统配置 - configValue = okrConfigSystemService.getValueWithConfigCode( "TOPUNIT_WORK_ADMIN" ); - if( configValue == null || configValue.isEmpty() || configValue.trim().length() == 0 ){ - iCanDeploy = true; - logger.debug( "系统已经被配置为所有人可以部署工作, 用户拥有工作部署权限!" ); - }else{ - //TOPUNIT_WORK_ADMIN不为空,那么, 看看配置的人员身份,是否和当前登录者身份一致. - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - iCanDeploy = true; - logger.debug( "用户已经被设置为顶层组织工作管理员, 用户拥有工作部署权限!" ); - } - } catch (Exception e ) { - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - }else{ - logger.debug( "用户拥有系统管理员角色, 默认拥有工作部署权限!" ); - } - if( !iCanDeploy ){ - logger.debug( "用户未拥有工作部署权限!" ); - } - wrapOutBoolean.setValue(iCanDeploy); - - result.setData( wrapOutBoolean ); - - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionDelete.java deleted file mode 100644 index baebf12757..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionDelete.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigDelete; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigSystem; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrUserCache okrUserCache = null; - OkrConfigSystem okrConfigSystem = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionSystemConfigIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try{ - okrConfigSystem = okrConfigSystemService.get( id ); - if( okrConfigSystem != null ){ - okrConfigSystemService.delete( id ); - ApplicationCache.notify( OkrConfigSystem.class ); - - if( okrConfigSystem != null ) { - WrapInWorkDynamic.sendWithSystemConfig( - okrConfigSystem, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "删除系统配置", - "系统配置删除成功！" - ); - } - } - result.setData( new Wo( id ) ); - }catch(Exception e){ - Exception exception = new ExceptionSystemConfigDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGet.java deleted file mode 100644 index d6d2221787..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGet.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigQueryById; -import com.x.okr.entity.OkrConfigSystem; - -import net.sf.ehcache.Element; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrConfigSystem okrConfigSystem = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionSystemConfigIdEmpty(); - result.error( exception ); - }else{ - String cacheKey = catchNamePrefix + "." + id; - Element element = null; - element = cache.get( cacheKey ); - if( element != null ){ - wrap = (Wo) element.getObjectValue(); - result.setData( wrap ); - }else{ - try { - okrConfigSystem = okrConfigSystemService.get( id ); - if( okrConfigSystem != null ){ - wrap = Wo.copier.copy( okrConfigSystem ); - cache.put( new Element( cacheKey, wrap ) ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionSystemConfigNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionSystemConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - return result; - } - - public static class Wo extends OkrConfigSystem{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigSystem.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGetByCode.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGetByCode.java deleted file mode 100644 index 75dc4cf7c4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionGetByCode.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigCodeEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigQueryByCode; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrConfigSystem; - -import net.sf.ehcache.Element; - -public class ActionGetByCode extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetByCode.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult(); - Wo wrap = null; - Wi wrapIn = null; - Boolean check = true; - OkrConfigSystem okrConfigSystem = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ) { - if( wrapIn.getConfigCode() == null || wrapIn.getConfigCode().isEmpty() ){ - Exception exception = new ExceptionSystemConfigCodeEmpty(); - result.error( exception ); - }else{ - String cacheKey = catchNamePrefix + "." + wrapIn.getConfigCode(); - Element element = null; - element = cache.get( cacheKey ); - if( element != null ){ - wrap = ( Wo ) element.getObjectValue(); - result.setData( wrap ); - }else{ - try { - okrConfigSystem = okrConfigSystemService.getWithConfigCode( wrapIn.getConfigCode() ); - if( okrConfigSystem != null ){ - wrap = Wo.copier.copy( okrConfigSystem ); - cache.put( new Element( cacheKey, wrap ) ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionSystemConfigNotExists( wrapIn.getConfigCode() ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionSystemConfigQueryByCode( e, wrapIn.getConfigCode() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - } - return result; - } - - public static class Wi extends OkrConfigSystem { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - public static class Wo extends OkrConfigSystem{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigSystem.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionListAll.java deleted file mode 100644 index b16cdb03cb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionListAll.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigListAll; -import com.x.okr.entity.OkrConfigSystem; - -import net.sf.ehcache.Element; - -public class ActionListAll extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListAll.class ); - - @SuppressWarnings("unchecked") - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson ) throws Exception { - ActionResult> result = new ActionResult>(); - List wraps = null; - List okrConfigSystemList = null; - - String cacheKey = catchNamePrefix + ".all"; - Element element = null; - - element = cache.get( cacheKey ); - if( element != null ){ - wraps = ( List ) element.getObjectValue(); - result.setData( wraps ); - result.setCount( Long.parseLong( wraps.size() +"" ) ); - }else{ - try { - okrConfigSystemList = okrConfigSystemService.listAll(); - if( okrConfigSystemList != null ){ - wraps = Wo.copier.copy( okrConfigSystemList ); - SortTools.asc( wraps, true, "orderNumber"); - cache.put( new Element( cacheKey, wraps ) ); - result.setCount( Long.parseLong( wraps.size() +"" ) ); - result.setData( wraps ); - } - } catch (Exception e) { - Exception exception = new ExceptionSystemConfigListAll( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrConfigSystem{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigSystem.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionSave.java deleted file mode 100644 index dbb243972a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/ActionSave.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionSystemConfigSave; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigSystem; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionSave extends BaseAction { - - private DateOperation dateOperation = new DateOperation(); - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrConfigSystem okrConfigSystem = null; - Boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( wrapIn != null && check ){ - try { - okrConfigSystem = okrConfigSystemService.save( wrapIn ); - result.setData( new Wo( okrConfigSystem.getId() )); - - ApplicationCache.notify( OkrConfigSystem.class ); - - if( okrConfigSystem != null ) { - WrapInWorkDynamic.sendWithSystemConfig( - okrConfigSystem, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "修改系统配置", - "系统配置修改保存成功！" - ); - } - - } catch (Exception e) { - Exception exception = new ExceptionSystemConfigSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( "REPORT_CREATETIME".equals( okrConfigSystem.getConfigCode() )){ - logger.info( "report_createtime has modified, next report for all processing work will be checked." ); - updateReportTimeForWorks( okrConfigSystem.getConfigValue() ); - } - } - - return result; - } - - /** - * 修改了汇报生成时间，需要重新计算所有工作的下一次汇报时间 - * @param reportStartTime - * @return - * @throws Exception - */ - private Boolean updateReportTimeForWorks( String reportStartTime ) throws Exception { - List ids = null; - Integer total = 0; - Integer count = 0; - OkrWorkBaseInfo okrWorkBaseInfo = null; - if( reportStartTime == null || reportStartTime.isEmpty() ){ - reportStartTime = "10:00:00"; - } - try { - ids = okrWorkBaseInfoQueryService.listAllProcessingWorkIds(); - if ( ListTools.isNotEmpty( ids ) ) { - total = ids.size(); - for ( String id : ids ) { - count++; - logger.info( "[" + count + "/" + total + "]system trying to check next report time for work:" + id + "......" ); - okrWorkBaseInfo = okrWorkBaseInfoQueryService.get( id ); - if( okrWorkBaseInfo != null ){ - updateReportTimeForWork( okrWorkBaseInfo, reportStartTime ); - }else{ - logger.info( "[" + count + "/" + total + "]work:{"+ id +"} not exists." ); - } - } - } - } catch (Exception e) { - logger.warn("system list work ids what needs report new got an exception." ); - logger.error(e); - } - return true; - } - - private Boolean updateReportTimeForWork( OkrWorkBaseInfo okrWorkBaseInfo, String reportStartTime ) throws Exception { - //修改了汇报生成时间，需要重新计算所有工作的下一次汇报时间 - if( !"不汇报".equals( okrWorkBaseInfo.getReportCycle() ) && okrWorkBaseInfo.getReportCycle() != null ){ - if( "每周汇报".equals( okrWorkBaseInfo.getReportCycle().trim() ) ){ - updateWeekReportTimeForWork( okrWorkBaseInfo, reportStartTime ); - }else if( "每月汇报".equals( okrWorkBaseInfo.getReportCycle().trim() ) ){ - updateMonthReportTimeForWork( okrWorkBaseInfo, reportStartTime ); - } - } - return true; - } - - private Boolean updateWeekReportTimeForWork( OkrWorkBaseInfo okrWorkBaseInfo, String reportStartTime ) throws Exception { - Date nextReportTime = null; - String reportTimeQue = null; - if( okrWorkBaseInfo.getReportDayInCycle() >= 1 && okrWorkBaseInfo.getReportDayInCycle() <= 7 ){ - try {//每周1-7 - reportTimeQue = okrWorkBaseInfoQueryService.getReportTimeQue( - dateOperation.getDateFromString( okrWorkBaseInfo.getDeployDateStr() ), - okrWorkBaseInfo.getCompleteDateLimit(), - okrWorkBaseInfo.getReportCycle(), - okrWorkBaseInfo.getReportDayInCycle(), - reportStartTime - ); - nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime( reportTimeQue, okrWorkBaseInfo.getLastReportTime() ); - if( nextReportTime == null ){ - nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime(okrWorkBaseInfo); - } - okrWorkBaseInfoOperationService.updateWorkReportTime( okrWorkBaseInfo.getId(), nextReportTime, reportTimeQue ); - } catch (Exception e) { - logger.warn("系统根据汇报周期信息计算汇报时间序列时发生异常。DeployDate："+ okrWorkBaseInfo.getDeployDateStr()+", CompleteDateLimit:"+ okrWorkBaseInfo.getCompleteDateLimit()+", ReportCycle:"+ okrWorkBaseInfo.getReportCycle()+", ReportDayInCycle:" + okrWorkBaseInfo.getReportDayInCycle() + ", ReportStartTime:" + reportStartTime); - e.printStackTrace(); - } - }else{ - logger.warn( "report day in cycle is invalid（1~7），ReportDayInCycle：" + okrWorkBaseInfo.getReportDayInCycle() ); - } - return true; - } - - private Boolean updateMonthReportTimeForWork( OkrWorkBaseInfo okrWorkBaseInfo, String reportStartTime ) throws Exception { - Date nextReportTime = null; - String reportTimeQue = null; - if( okrWorkBaseInfo.getReportDayInCycle() >= 1 && okrWorkBaseInfo.getReportDayInCycle() <= 31 ){ - //每月1-31，如果选择的日期大于当月最大日期，那么默认定为当月最后一天 - try { - reportTimeQue = okrWorkBaseInfoQueryService.getReportTimeQue( - dateOperation.getDateFromString( okrWorkBaseInfo.getDeployDateStr() ), - okrWorkBaseInfo.getCompleteDateLimit(), - okrWorkBaseInfo.getReportCycle(), - okrWorkBaseInfo.getReportDayInCycle(), - reportStartTime - ); - nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime( reportTimeQue, okrWorkBaseInfo.getLastReportTime() ); - if( nextReportTime == null ){ - nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime(okrWorkBaseInfo); - } - okrWorkBaseInfoOperationService.updateWorkReportTime( okrWorkBaseInfo.getId(), nextReportTime, reportTimeQue ); - } catch (Exception e) { - logger.warn("系统根据汇报周期信息计算汇报时间序列时发生异常。DeployDate："+ okrWorkBaseInfo.getDeployDateStr()+", CompleteDateLimit:"+ okrWorkBaseInfo.getCompleteDateLimit()+", ReportCycle:"+ okrWorkBaseInfo.getReportCycle()+", ReportDayInCycle:" + okrWorkBaseInfo.getReportDayInCycle() + ", ReportStartTime:" + reportStartTime); - throw e; - } - }else{ - logger.warn("工作的工作日期不合法（1~31），ReportDayInCycle：" + okrWorkBaseInfo.getReportDayInCycle() ); - } - return true; - } - - public static class Wi extends OkrConfigSystem { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/BaseAction.java deleted file mode 100644 index 0d9e6977e3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/BaseAction.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.entity.OkrConfigSystem; - -import net.sf.ehcache.Ehcache; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoQueryService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected Ehcache cache = ApplicationCache.instance().getCache( OkrConfigSystem.class ); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected String catchNamePrefix = this.getClass().getName(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/OkrConfigSystemAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/OkrConfigSystemAction.java deleted file mode 100644 index 63da63ad29..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/OkrConfigSystemAction.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrconfigsystem") -@JaxrsDescribe("系统配置管理服务") -public class OkrConfigSystemAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrConfigSystemAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新系统配置信息对象", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteSave got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除系统配置信息对象", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("系统配置信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取系统配置信息对象", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("系统配置信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception. id：" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "获取所有系统配置信息列表", action = ActionListAll.class) - @GET - @Path("all") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void all(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListAll().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListAll got an exception."); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据CODE获取系统配置信息", action = ActionGetByCode.class) - @Path("code") - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getByCode(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - if (check) { - try { - result = new ActionGetByCode().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGetByCode got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据系统配置查询用户是否有权限部署工作信息", action = ActionAllowedDeployWork.class) - @GET - @Path("allowed/deploy") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void allowedDeployWork(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionAllowedDeployWork().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteAllowedDeployWork got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 1026dec081..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigCodeEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigCodeEmpty.java deleted file mode 100644 index d52f3cf067..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigCodeEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigCodeEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigCodeEmpty() { - super("configCode为空，无法进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigDelete.java deleted file mode 100644 index 3c6e7e7ef4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigDelete( Throwable e, String flag ) { - super("删除指定的系统配置时发生异常。Flag:" + flag, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigIdEmpty.java deleted file mode 100644 index 46fe29e271..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigIdEmpty() { - super("id为空，无法进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigListAll.java deleted file mode 100644 index 033a4ca77a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigListAll.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigListAll extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigListAll( Throwable e ) { - super("查询所有的OKR系统配置时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigNotExists.java deleted file mode 100644 index cf6e30c615..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigNotExists( String flag ) { - super("指定的系统配置信息不存在。Flag:" + flag ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryByCode.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryByCode.java deleted file mode 100644 index b70ab7d44c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryByCode.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigQueryByCode extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigQueryByCode( Throwable e, String code ) { - super("根据指定的Code查询系统配置时发生异常。Code:" + code, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryById.java deleted file mode 100644 index 2cf8ce609b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigQueryById( Throwable e, String id ) { - super("根据指定的ID查询系统配置时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigSave.java deleted file mode 100644 index c04adef547..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionSystemConfigSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigSave( Throwable e ) { - super("Okr系统配置信息保存时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 38b93da9d0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 15c4e36fdb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigsystem/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionDelete.java deleted file mode 100644 index d4568678f9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionDelete.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigDelete; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigQueryById; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigWorkLevel; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrConfigWorkLevel okrConfigWorkLevel = null; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkLevelConfigIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try { - okrConfigWorkLevel = okrConfigWorkLevelService.get( id ); - if( okrConfigWorkLevel == null ){ - check = false; - Exception exception = new ExceptionWorkLevelConfigNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkLevelConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrConfigWorkLevelService.delete( id ); - - if( okrConfigWorkLevel != null ) { - WrapInWorkDynamic.sendWithConfigWorkLevel( - okrConfigWorkLevel, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "删除工作级别信息", - "删除工作级别信息成功！" - ); - } - - result.setData( new Wo(id)); - }catch(Exception e){ - Exception exception = new ExceptionWorkLevelConfigDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionGet.java deleted file mode 100644 index c0f46c4503..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionGet.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigQueryById; -import com.x.okr.entity.OkrConfigWorkLevel; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrConfigWorkLevel okrConfigWorkLevel = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkLevelConfigIdEmpty(); - result.error( exception ); - }else{ - try { - okrConfigWorkLevel = okrConfigWorkLevelService.get( id ); - if( okrConfigWorkLevel != null ){ - wrap = Wo.copier.copy( okrConfigWorkLevel ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionWorkLevelConfigNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkLevelConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrConfigWorkLevel{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigWorkLevel.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionListAll.java deleted file mode 100644 index 054b8e3099..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionListAll.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigListAll; -import com.x.okr.entity.OkrConfigWorkLevel; - -public class ActionListAll extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListAll.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrConfigWorkLevelList = null; - try { - okrConfigWorkLevelList = okrConfigWorkLevelService.listAll(); - if( okrConfigWorkLevelList != null ){ - wraps = Wo.copier.copy( okrConfigWorkLevelList ); - result.setData(wraps); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkLevelConfigListAll( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - - public static class Wo extends OkrConfigWorkLevel{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigWorkLevel.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionSave.java deleted file mode 100644 index b617b172b6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/ActionSave.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWorkLevelConfigSave; -import com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigWorkLevel; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrConfigWorkLevel okrConfigWorkLevel = null; - Wi wrapIn = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ) { - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && wrapIn != null ){ - try { - okrConfigWorkLevel = okrConfigWorkLevelService.save( wrapIn ); - result.setData( new Wo( okrConfigWorkLevel.getId() )); - - if( okrConfigWorkLevel != null ) { - WrapInWorkDynamic.sendWithConfigWorkLevel( - okrConfigWorkLevel, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "保存工作级别信息", - "保存工作级别信息成功！" - ); - } - - } catch (Exception e) { - Exception exception = new ExceptionWorkLevelConfigSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrConfigWorkLevel { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/BaseAction.java deleted file mode 100644 index 14f10245f2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/BaseAction.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrConfigWorkLevelService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrConfigWorkLevelService okrConfigWorkLevelService = new OkrConfigWorkLevelService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/OkrConfigWorkLevelAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/OkrConfigWorkLevelAction.java deleted file mode 100644 index 1484484045..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/OkrConfigWorkLevelAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrconfigworklevel") -@JaxrsDescribe("工作级别管理服务") -public class OkrConfigWorkLevelAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrConfigWorkLevelAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作级别信息对象", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteSave got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作级别信息对象", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作级别信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作级别信息对象", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作级别信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception. id：" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "获取所有工作级别信息列表", action = ActionListAll.class) - @GET - @Path("all") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void all(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListAll().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListAll got an exception."); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 647272a6a0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionUserNoLogin.java deleted file mode 100644 index a88773f6e8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigDelete.java deleted file mode 100644 index 3fd5ee9574..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkLevelConfigDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkLevelConfigDelete( Throwable e, String id ) { - super("系统根据ID查询指定的工作级别配置时发生异常。ID:" + id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigIdEmpty.java deleted file mode 100644 index 6c567cf4bd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkLevelConfigIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkLevelConfigIdEmpty() { - super("id为空，无法进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigListAll.java deleted file mode 100644 index 24ef0fec36..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigListAll.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkLevelConfigListAll extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkLevelConfigListAll( Throwable e ) { - super("系统根据ID查询指定的工作级别配置时发生异常。", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigNotExists.java deleted file mode 100644 index d200acc673..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkLevelConfigNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkLevelConfigNotExists( String id ) { - super("指定ID的工作级别配置不存在。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigQueryById.java deleted file mode 100644 index c84ce16ab7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkLevelConfigQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkLevelConfigQueryById( Throwable e, String id ) { - super("系统根据ID删除指定的工作级别配置时发生异常。ID:" + id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigSave.java deleted file mode 100644 index a42b98d7ef..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWorkLevelConfigSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkLevelConfigSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkLevelConfigSave( Throwable e ) { - super("系统保存工作级别配置时发生异常。", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWrapInConvert.java deleted file mode 100644 index e506766de0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworklevel/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworklevel.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/BaseAction.java deleted file mode 100644 index 6892ad4f81..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/BaseAction.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrConfigWorkTypeService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkPersonSearchService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; -import com.x.okr.entity.OkrConfigWorkType; - -import net.sf.ehcache.Ehcache; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrConfigWorkTypeService okrConfigWorkTypeService = new OkrConfigWorkTypeService(); - protected OkrWorkPersonSearchService okrWorkPersonSearchService = new OkrWorkPersonSearchService(); - protected OkrCenterWorkQueryService okrCenterWorkQueryService = new OkrCenterWorkQueryService(); - protected OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected Ehcache cache = ApplicationCache.instance().getCache( OkrConfigWorkType.class ); - protected String catchNamePrefix = this.getClass().getName(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteDelete.java deleted file mode 100644 index e834ba2751..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteDelete.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigDelete; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigQueryById; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigWorkType; - -public class ExcuteDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ExcuteDelete.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrConfigWorkType okrConfigWorkType = null; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkTypeConfigIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try { - okrConfigWorkType = okrConfigWorkTypeService.get( id ); - if( okrConfigWorkType == null ){ - check = false; - Exception exception = new ExceptionWorkTypeConfigNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkTypeConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - okrConfigWorkTypeService.delete( id ); - result.setData( new Wo( id )); - ApplicationCache.notify( OkrConfigWorkType.class ); - - if( okrConfigWorkType != null ) { - WrapInWorkDynamic.sendWithConfigWorkType( - okrConfigWorkType, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "删除工作级别信息", - "删除工作级别信息成功！" - ); - } - }catch(Exception e){ - Exception exception = new ExceptionWorkTypeConfigDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteGet.java deleted file mode 100644 index e408f6b95b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteGet.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigNotExists; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigQueryById; -import com.x.okr.entity.OkrConfigWorkType; - -import net.sf.ehcache.Element; - -public class ExcuteGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ExcuteGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrConfigWorkType okrConfigWorkType = null; - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkTypeConfigIdEmpty(); - result.error( exception ); - }else{ - String cacheKey = catchNamePrefix + "." + id; - Element element = null; - - element = cache.get( cacheKey ); - if( element != null ){ - wrap = (Wo) element.getObjectValue(); - result.setData( wrap ); - }else{ - try { - okrConfigWorkType = okrConfigWorkTypeService.get( id ); - if( okrConfigWorkType != null ){ - wrap = Wo.copier.copy( okrConfigWorkType ); - cache.put( new Element( cacheKey, wrap ) ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionWorkTypeConfigNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkTypeConfigQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - return result; - } - - public static class Wo extends OkrConfigWorkType{ - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigWorkType.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long centerCount = 0L; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Long getCenterCount() { - return centerCount; - } - - public void setCenterCount(Long centerCount) { - this.centerCount = centerCount; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListAll.java deleted file mode 100644 index f4319b1c26..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListAll.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigListAll; -import com.x.okr.entity.OkrConfigWorkType; - -import net.sf.ehcache.Element; - -public class ExcuteListAll extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ExcuteListAll.class); - - @SuppressWarnings("unchecked") - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson) - throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrConfigWorkTypeList = null; - - String cacheKey = catchNamePrefix + ".all"; - Element element = null; - - element = cache.get(cacheKey); - if (element != null) { - wraps = (List) element.getObjectValue(); - result.setData(wraps); - } else { - try { - okrConfigWorkTypeList = okrConfigWorkTypeService.listAll(); - if (okrConfigWorkTypeList != null && !okrConfigWorkTypeList.isEmpty()) { - wraps = Wo.copier.copy(okrConfigWorkTypeList); - cache.put(new Element(cacheKey, wraps)); - result.setData(wraps); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkTypeConfigListAll(e); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrConfigWorkType { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo(OkrConfigWorkType.class, Wo.class, - null, JpaObject.FieldsInvisible); - - private Long centerCount = 0L; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Long getCenterCount() { - return centerCount; - } - - public void setCenterCount(Long centerCount) { - this.centerCount = centerCount; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListTypeCount.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListTypeCount.java deleted file mode 100644 index 55675dea62..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteListTypeCount.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigListTypeCount; -import com.x.okr.entity.OkrConfigWorkType; - -public class ExcuteListTypeCount extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ExcuteListTypeCount.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, WorkCommonQueryFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrConfigWorkTypeList = null; - List workTypes = new ArrayList<>(); - Long total = 0L; - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( wrapIn == null ){ - wrapIn = new WorkCommonQueryFilter(); - } - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - okrConfigWorkTypeList = okrConfigWorkTypeService.listAll(); - if( okrConfigWorkTypeList != null && !okrConfigWorkTypeList.isEmpty() ){ - wraps = Wo.copier.copy( okrConfigWorkTypeList ); - for( Wo wrap : wraps ){ - //统计用户可以看到的每一个类别的中心工作数量 - workTypes.clear(); - if( wrap.getWorkTypeName() != null && !wrap.getWorkTypeName().isEmpty() ){ - workTypes.add( wrap.getWorkTypeName() ); - } - wrapIn.setDefaultWorkTypes( workTypes ); - if( !okrUserCache.isOkrManager() ){ - wrapIn.setIdentity( okrUserCache.getLoginIdentityName() ); - total = okrWorkPersonSearchService.getCenterCountWithFilter( wrapIn ); - }else{ - WorkCommonQueryFilter wrpaIn_admin = new WorkCommonQueryFilter(); - wrpaIn_admin.setDefaultWorkTypes( workTypes ); - total = okrCenterWorkQueryService.getCountWithFilter( wrpaIn_admin ); - } - wrap.setCenterCount( total ); - } - result.setData( wraps ); - } - } catch ( Exception e) { - Exception exception = new ExceptionWorkTypeConfigListTypeCount(e); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrConfigWorkType{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrConfigWorkType.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long centerCount = 0L; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Long getCenterCount() { - return centerCount; - } - - public void setCenterCount(Long centerCount) { - this.centerCount = centerCount; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteSave.java deleted file mode 100644 index cc0dd13f6f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/ExcuteSave.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsystem.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigSave; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWorkTypeConfigValidate; -import com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrConfigWorkType; - -public class ExcuteSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ExcuteSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrConfigWorkType okrConfigWorkType = null; - Wi wrapIn = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( wrapIn.getWorkTypeName() == null || wrapIn.getWorkTypeName().isEmpty() ) { - check = false; - Exception exception = new ExceptionWorkTypeConfigValidate( "工作类别排名称不能为空！" ); - result.error( exception ); - } - } - if( check ){ - if( wrapIn.getOrderNumber() == null ) { - check = false; - Exception exception = new ExceptionWorkTypeConfigValidate( "工作类别排序号不能为空！" ); - result.error( exception ); - } - } - if( check ){ - try { - okrConfigWorkType = okrConfigWorkTypeService.save( wrapIn ); - result.setData( new Wo( okrConfigWorkType.getId() )); - ApplicationCache.notify( OkrConfigWorkType.class ); - - if( okrConfigWorkType != null ) { - WrapInWorkDynamic.sendWithConfigWorkType( - okrConfigWorkType, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "保存工作级别信息", - "保存工作级别信息成功！" - ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkTypeConfigSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrConfigWorkType { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/OkrConfigWorkTypeAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/OkrConfigWorkTypeAction.java deleted file mode 100644 index fbda25d556..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/OkrConfigWorkTypeAction.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrconfigworktype") -@JaxrsDescribe("工作类别管理服务") -public class OkrConfigWorkTypeAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrConfigWorkTypeAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作类别信息对象", action = ExcuteSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ExcuteSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteSave got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作类别信息对象", action = ExcuteDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作类别信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ExcuteDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作类别信息对象", action = ExcuteGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作类别信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ExcuteGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception. id：" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "获取所有工作类别信息列表", action = ExcuteListAll.class) - @GET - @Path("all") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void all(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ExcuteListAll().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListAll got an exception."); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "获取所有工作类别信息列表，并且统计每一类所有的中心工作数量.", action = ExcuteListTypeCount.class) - @GET - @Path("countAll") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void countAll(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ExcuteListTypeCount().execute(request, effectivePerson, null); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListTypeCount got an exception."); - logger.error(e, effectivePerson, request, null); - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 837185707a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionUserNoLogin.java deleted file mode 100644 index e59975fc90..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigDelete.java deleted file mode 100644 index ab7cdb368b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigDelete( Throwable e, String id ) { - super("系统根据ID查询指定的工作类别配置时发生异常。ID:" + id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigIdEmpty.java deleted file mode 100644 index bbc62a25bf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigIdEmpty() { - super("id为空，无法进行查询操作。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListAll.java deleted file mode 100644 index 17fe7bf74d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListAll.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigListAll extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigListAll( Throwable e ) { - super("系统根据ID查询指定的工作类别配置时发生异常。", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListTypeCount.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListTypeCount.java deleted file mode 100644 index 2a41fffa2d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigListTypeCount.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigListTypeCount extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigListTypeCount( Throwable e ) { - super("系统查询所有类别的工作数量列表时发生异常。", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigNotExists.java deleted file mode 100644 index bb2c7b6774..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigNotExists( String id ) { - super("指定ID的工作类别配置不存在。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigQueryById.java deleted file mode 100644 index c4d925fd08..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigQueryById( Throwable e, String id ) { - super("系统根据ID删除指定的工作类别配置时发生异常。ID:" + id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigSave.java deleted file mode 100644 index 7032f381db..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigSave( Throwable e ) { - super("系统保存工作类别配置时发生异常。", e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigValidate.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigValidate.java deleted file mode 100644 index b546521d54..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWorkTypeConfigValidate.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkTypeConfigValidate extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkTypeConfigValidate( String message ) { - super( message ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 1ed1e63585..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrconfigworktype/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrconfigworktype.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionCountMyTask.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionCountMyTask.java deleted file mode 100644 index 1223d06203..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionCountMyTask.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoText; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.dataadapter.wftask.WfReadCountGetter; -import com.x.okr.assemble.control.dataadapter.wftask.WfTaskCountGetter; -import com.x.okr.assemble.control.service.OkrUserManagerService; - -/** - * 获取指定人员的OKR待办数量 - * @author O2LEE - * - */ -public class ActionCountMyTask extends BaseAction { - - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - private static Logger logger = LoggerFactory.getLogger( ActionCountMyTask.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String flag, String callbackName ) throws Exception { - ActionResult result = new ActionResult<>(); - List notInTaskTypeList = new ArrayList(); - String personName = null; - Long taskCount = 0L; - Boolean check = true; - - try { - personName = okrUserManagerService.getPersonNameWithFlag( flag ); - if( StringUtils.isEmpty( personName )) { - check = false; - logger.warn("系统未能根据用户标识查询到指定的用户，标识(flag)：" + flag); - } - } catch ( Exception e ) { - check = false; - e.printStackTrace(); - } - - if(check && StringUtils.isNotEmpty( personName ) ) { - notInTaskTypeList.add( "工作汇报" ); - try{ - taskCount = okrTaskService.getTaskCountByUserName( null, notInTaskTypeList, personName ); - }catch(Exception e){ - e.printStackTrace(); - } - - //获取该用户指定应用的待办数量 - try{ - taskCount += new WfTaskCountGetter().countWithProcess(personName); - }catch(Exception e){ - e.printStackTrace(); - } - - //获取该用户指定应用的待阅数量 - try{ - taskCount += new WfReadCountGetter().countWithProcess(personName); - }catch(Exception e){ - e.printStackTrace(); - } - } - - Wo woText = new Wo(callbackName + "("+taskCount+")") ; - result.setData( woText ); - return result; - } - - public static class Wo extends WoText { - public Wo( String text ) { - this.setText( text ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionDelete.java deleted file mode 100644 index 8b3afc960f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionDelete.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskDelete; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskNotExists; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskQueryById; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrTask; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDelete.class); - - protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String id) - throws Exception { - ActionResult result = new ActionResult<>(); - OkrTask okrTask = null; - Boolean check = true; - Boolean hasPermission = false; - OkrUserCache okrUserCache = null; - - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new ExceptionUserNoLogin(effectivePerson.getDistinguishedName()); - result.error(exception); - } - if (check) { - if (id == null || id.isEmpty()) { - check = false; - Exception exception = new ExceptionTaskIdEmpty(); - result.error(exception); - } - } - if (check) { - try { - okrTask = okrTaskService.get(id); - if (okrTask == null) { - check = false; - Exception exception = new ExceptionTaskNotExists(id); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionTaskQueryById(e, id); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - try { - if ( !okrUserInfoService.getIsOkrManager( effectivePerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(effectivePerson.getDistinguishedName(), ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check && hasPermission) { - try { - okrTaskService.delete(id); - result.setData(new Wo(id)); - } catch (Exception e) { - Exception exception = new ExceptionTaskDelete(e, id); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - if ("工作汇报".equals(okrTask.getDynamicObjectType())) { - try { - List workTypeList = new ArrayList(); - workTypeList.add(okrTask.getWorkType()); - okrWorkReportTaskCollectService.checkReportCollectTask(okrTask.getTargetIdentity(), workTypeList); - } catch (Exception e) { - logger.warn("待办信息删除成功，但对汇报者进行汇报待办汇总发生异常。", e); - } - } - } - if (check) { - if( okrTask != null ) { - WrapInWorkDynamic.sendWithTask( - okrTask, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "删除待办待阅", - "管理员删除待办待阅操作成功！" - ); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionGet.java deleted file mode 100644 index bb52c07791..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionGet.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskNotExists; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskQueryById; -import com.x.okr.entity.OkrTask; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrTask okrTask = null; - Boolean check = true; - if(check){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionTaskIdEmpty(); - result.error( exception ); - } - } - if( check ){ - try { - okrTask = okrTaskService.get( id ); - if( okrTask != null ){ - wrap = Wo.copier.copy( okrTask ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionTaskNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionTaskQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrTask{ - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo( OkrTask.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListMyTaskNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListMyTaskNextWithFilter.java deleted file mode 100644 index 64348ddf34..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListMyTaskNextWithFilter.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.entity.OkrTask; - -public class ActionListMyTaskNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListMyTaskNextWithFilter.class); - - @SuppressWarnings("unchecked") - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserCache okrUserCache = null; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - } - - if (check) { - try { - // 只允许查询属于自己的登录身份的数据 - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - equalsMap.put("targetIdentity", okrUserCache.getLoginIdentityName()); - Collection dynamicObjectTypeNotIn = null; - if (notInsMap.get("dynamicObjectType") == null) { - dynamicObjectTypeNotIn = new ArrayList(); - } else { - if (notInsMap.get("dynamicObjectType") != null) { - dynamicObjectTypeNotIn = (Collection) notInsMap.get("dynamicObjectType"); - } - } - dynamicObjectTypeNotIn.add("工作汇报"); - notInsMap.put("dynamicObjectType", dynamicObjectTypeNotIn); - - result = this.standardListNext(Wo.copier, id, count, wrapIn.getSequenceField(), equalsMap, notEqualsMap, - likesMap, insMap, notInsMap, membersMap, notMembersMap, null, true, wrapIn.getOrder()); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } - - public static class Wi { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class Wo extends OkrTask { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrTask.class, Wo.class, null, Wo.Excludes); - - private Long rank; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListNextWithFilter.java deleted file mode 100644 index 2b071238bf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListNextWithFilter.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.entity.OkrTask; - -public class ActionListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if( !"xadmin".equalsIgnoreCase( effectivePerson.getName() )) { - try { - if (!okrUserInfoService.getIsOkrManager(effectivePerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(effectivePerson.getDistinguishedName(), ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("dynamicObjectTitle", wrapIn.getFilterLikeContent()); - likesMap.put("targetName", wrapIn.getFilterLikeContent()); - likesMap.put("targetIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("dynamicObjectType", wrapIn.getFilterLikeContent()); - } - } - - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, true, wrapIn.getOrder()); - - } catch (Exception e) { - check = false; - logger.warn("系统查询待办信息列表时发生异常!"); - result.error(e); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class Wo extends OkrTask { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrTask.class, Wo.class, null, Wo.Excludes); - - private Long rank; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListPrevWithFilter.java deleted file mode 100644 index 29c7109317..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListPrevWithFilter.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.entity.OkrTask; - -public class ActionListPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListPrevWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - try { - if (!okrUserInfoService.getIsOkrManager(effectivePerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(effectivePerson.getDistinguishedName(), - ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("dynamicObjectTitle", wrapIn.getFilterLikeContent()); - likesMap.put("targetName", wrapIn.getFilterLikeContent()); - likesMap.put("targetIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("dynamicObjectType", wrapIn.getFilterLikeContent()); - } - } - - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListPrev(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, true, wrapIn.getOrder()); - - } catch (Exception e) { - check = false; - logger.warn("系统查询待办信息列表时发生异常!"); - result.error(e); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class Wo extends OkrTask { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrTask.class, Wo.class, null, Wo.Excludes); - - private Long rank; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListTaskCollect.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListTaskCollect.java deleted file mode 100644 index 68a8475c0c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionListTaskCollect.java +++ /dev/null @@ -1,715 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionSystemConfigQueryByCode; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskListByTaskType; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskQueryById; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionWorkQueryById; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ActionListTaskCollect extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListTaskCollect.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult<>(); - List collectList = new ArrayList(); - String userIdentity = null; - String workAdminIdentity = null; - List taskList = null; - OkrTask okrTask = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - WoOkrWorkReportBaseInfo wrapOutOkrWorkReportBaseInfo = null; - List taskTypeList = new ArrayList(); - Boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - userIdentity = okrUserCache.getLoginIdentityName() ; - } - - if( check ){ - if( id == null ){ - check = false; - Exception exception = new ExceptionTaskIdEmpty(); - result.error( exception ); - }else{ - //查询该汇总待办信息 - try { - okrTask = okrTaskService.get( id ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionTaskQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if( check ){ - if( okrTask != null ){ - taskTypeList.add( "工作汇报" ); - try { - //获取所有符合条件的待办 - taskList = okrTaskService.listTaskByTaskType( taskTypeList, userIdentity, okrTask.getWorkType() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionTaskListByTaskType( e, userIdentity ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - result.setCount( 0L ); - } - } - - if( check ){ - try { - workAdminIdentity = okrConfigSystemService.getValueWithConfigCode( "REPORT_SUPERVISOR" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigQueryByCode( e, "REPORT_SUPERVISOR" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( taskList != null && !taskList.isEmpty() ){ - for( OkrTask task : taskList ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( task.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( task.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, task.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( task.getDynamicObjectId() ); - } catch (Exception e) { - logger.warn( "get okrWorkReportBaseInfo by id got an exception." ); - logger.error(e); - } - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get( task.getDynamicObjectId() ); - } catch (Exception e) { - logger.warn( "get okrWorkReportBaseInfo by id got an exception." ); - logger.error(e); - } - if( okrWorkReportBaseInfo != null ){ - try { - wrapOutOkrWorkReportBaseInfo = WoOkrWorkReportBaseInfo.copier.copy( okrWorkReportBaseInfo ); - if( wrapOutOkrWorkReportBaseInfo != null ){ - //查询工作所对应的工作信息 - - wrapOutOkrWorkReportBaseInfo.setWorkInfo( WoOkrWorkBaseInfo.copier.copy(okrWorkBaseInfo)); - } - - if( okrWorkReportDetailInfo != null ){ - wrapOutOkrWorkReportBaseInfo.setWorkPointAndRequirements( okrWorkReportDetailInfo.getWorkPointAndRequirements() ); - wrapOutOkrWorkReportBaseInfo.setWorkPlan( okrWorkReportDetailInfo.getWorkPlan() ); - wrapOutOkrWorkReportBaseInfo.setAdminSuperviseInfo( okrWorkReportDetailInfo.getAdminSuperviseInfo()); - wrapOutOkrWorkReportBaseInfo.setProgressDescription( okrWorkReportDetailInfo.getProgressDescription() ); - } - - if( wrapOutOkrWorkReportBaseInfo.getCreatorIdentity() != null && okrUserCache.getLoginIdentityName() .equalsIgnoreCase( wrapOutOkrWorkReportBaseInfo.getCreatorIdentity())){ - wrapOutOkrWorkReportBaseInfo.setIsCreator( true ); - } - if( wrapOutOkrWorkReportBaseInfo.getReporterIdentity() != null && okrUserCache.getLoginIdentityName() .equalsIgnoreCase( wrapOutOkrWorkReportBaseInfo.getReporterIdentity())){ - wrapOutOkrWorkReportBaseInfo.setIsReporter(true); - } - if( "ADMIN_AND_ALLLEADER".equals( wrapOutOkrWorkReportBaseInfo.getReportWorkflowType() )){ - //从汇报审阅领导里进行比对 - if( ListTools.isNotEmpty( wrapOutOkrWorkReportBaseInfo.getReadLeadersIdentityList() ) - &&wrapOutOkrWorkReportBaseInfo.getReadLeadersIdentityList().contains(okrUserCache.getLoginIdentityName() ) ){ - wrapOutOkrWorkReportBaseInfo.setIsReadLeader( true ); - } - }else if( "DEPLOYER".equals( wrapOutOkrWorkReportBaseInfo.getReportWorkflowType() ) ){ - if( okrWorkBaseInfo != null ){ - //对比当前工作的部署者是否是当前用户 - if( okrWorkBaseInfo.getDeployerIdentity() != null && okrWorkBaseInfo.getDeployerIdentity().equalsIgnoreCase( okrUserCache.getLoginIdentityName() ) ){ - wrapOutOkrWorkReportBaseInfo.setIsReadLeader( true ); - } - } - } - if( workAdminIdentity != null && !workAdminIdentity.isEmpty() && okrUserCache.getLoginIdentityName() .equalsIgnoreCase( workAdminIdentity )){ - wrapOutOkrWorkReportBaseInfo.setIsWorkAdmin( true ); - } - //把汇报对象放进输出里 - addReportToCollectList( wrapOutOkrWorkReportBaseInfo, collectList ); - - } catch (Exception e) { - logger.warn( "format okrWorkReportBaseInfo to wrap got an exception." ); - logger.error(e); - } - } - } - }else { - //说明已经没有任何待办信息了，这条汇总待办需要进行删除 - okrTaskService.delete( okrTask.getId() ); - } - } - result.setData( collectList ); - return result; - } - - /** - * 将处理好的汇报对象放入输出的分类List里 - * @param wrapOutOkrTaskReportEntity - * @param collectList - */ - private void addReportToCollectList( WoOkrWorkReportBaseInfo wrapOutOkrWorkReportBaseInfo, List collectList) { - - List wrapOutOkrTaskReportEntityList = null; - - WoOkrTaskCollectList wrapOutOkrTaskCollectList = null; - - WoOkrTaskReportEntity wrapOutOkrTaskReportEntity = null; - - Wo collect = findCollectFormCollectList( wrapOutOkrWorkReportBaseInfo, collectList ); - - boolean addAlready = false; - - if( collect != null ){ - - if ( collect.getReportCollect() == null ) { - collect.setReportCollect( new WoOkrTaskCollectList() ); - } - wrapOutOkrTaskCollectList = collect.getReportCollect(); - wrapOutOkrTaskCollectList.addUnitName( wrapOutOkrWorkReportBaseInfo.getReporterUnitName() ); - - if( wrapOutOkrTaskCollectList.getReportInfos() == null ){ - wrapOutOkrTaskCollectList.setReportInfos( new ArrayList()); - } - - wrapOutOkrTaskReportEntityList = wrapOutOkrTaskCollectList.getReportInfos(); - for( WoOkrTaskReportEntity _wrapOutOkrTaskReportEntity : wrapOutOkrTaskReportEntityList ){ - if( _wrapOutOkrTaskReportEntity.getName().equals( wrapOutOkrWorkReportBaseInfo.getReporterUnitName() )){ - _wrapOutOkrTaskReportEntity.addReports(wrapOutOkrWorkReportBaseInfo); - collect.setCount( collect.getCount() + 1 ); - addAlready = true; - } - } - - if( !addAlready ){ - wrapOutOkrTaskReportEntity = new WoOkrTaskReportEntity(); - wrapOutOkrTaskReportEntity.setName( wrapOutOkrWorkReportBaseInfo.getReporterUnitName() ); - wrapOutOkrTaskReportEntity.addReports( wrapOutOkrWorkReportBaseInfo ); - collect.setCount( collect.getCount() + 1 ); - wrapOutOkrTaskReportEntityList.add( wrapOutOkrTaskReportEntity ); - } - } - } - - private Wo findCollectFormCollectList( WoOkrWorkReportBaseInfo wrapOutOkrWorkReportBaseInfo, List collectList ) { - if( collectList == null ){ - collectList = new ArrayList(); - } - for( Wo collect : collectList ){ - //先找到该汇报所在环节的集合对象 - if( collect.getActivityName().equalsIgnoreCase( wrapOutOkrWorkReportBaseInfo.getActivityName() )){ - //找到对象的集合对象，放进去 - return collect; - } - } - //没找到，要根据环节名称创建一个新的集合，并且将汇报对象放入 - Wo collect = new Wo(); - - collect.setActivityName( wrapOutOkrWorkReportBaseInfo.getActivityName() ); - - collect.setCount( 0 ); - - collectList.add( collect ); - - return collect; - } - - public static class Wo extends OkrTask{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private String activity = null; - - private Integer count = 0; - - private WoOkrTaskCollectList reportCollect = null; - - public String getActivity() { - return activity; - } - - public void setActivity(String activity) { - this.activity = activity; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public WoOkrTaskCollectList getReportCollect() { - return reportCollect; - } - - public void setReportCollect(WoOkrTaskCollectList reportCollect) { - this.reportCollect = reportCollect; - } - } - - public static class WoOkrWorkReportBaseInfo extends OkrWorkReportBaseInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkReportBaseInfo.class, WoOkrWorkReportBaseInfo.class, null, JpaObject.FieldsInvisible); - - private Boolean isReporter = false; - - private Boolean isWorkAdmin = false; - - private Boolean isReadLeader = false; - - private Boolean isCreator = false; - - private Boolean needReportProgress = false; - - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private List processLogs = null; - - private WoOkrWorkBaseInfo workInfo = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Boolean getIsReporter() { - return isReporter; - } - - public void setIsReporter(Boolean isReporter) { - this.isReporter = isReporter; - } - - public Boolean getIsWorkAdmin() { - return isWorkAdmin; - } - - public void setIsWorkAdmin(Boolean isWorkAdmin) { - this.isWorkAdmin = isWorkAdmin; - } - - public Boolean getIsReadLeader() { - return isReadLeader; - } - - public void setIsReadLeader(Boolean isReadLeader) { - this.isReadLeader = isReadLeader; - } - - public Boolean getIsCreator() { - return isCreator; - } - - public void setIsCreator(Boolean isCreator) { - this.isCreator = isCreator; - } - - public String getProgressDescription() { - return progressDescription; - } - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - public String getWorkPlan() { - return workPlan; - } - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - public String getMemo() { - return memo; - } - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public List getProcessLogs() { - return processLogs; - } - - public void setProcessLogs(List processLogs) { - this.processLogs = processLogs; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public WoOkrWorkBaseInfo getWorkInfo() { - return workInfo; - } - - public void setWorkInfo(WoOkrWorkBaseInfo workInfo) { - this.workInfo = workInfo; - } - - public Boolean getNeedReportProgress() { - return needReportProgress; - } - - public void setNeedReportProgress(Boolean needReportProgress) { - this.needReportProgress = needReportProgress; - } - } - - public static class WoOkrTaskReportEntity extends OkrTask{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private String name = null; - - private List reports = null; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getReports() { - return reports; - } - - public void setReports(List reports) { - this.reports = reports; - } - - public void addReports( WoOkrWorkReportBaseInfo wrapOutOkrWorkReportBaseInfo) { - if( wrapOutOkrWorkReportBaseInfo == null ){ - return ; - } - - if( reports == null ){ - reports = new ArrayList(); - } - - if( !reports.contains( wrapOutOkrWorkReportBaseInfo )){ - reports.add( wrapOutOkrWorkReportBaseInfo ); - } - } - } - - public static class WoOkrTaskCollectList extends OkrTask{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private List unitNames = null; - - private List reportInfos = null; - - public List getUnitNames() { - return unitNames; - } - - public void setUnitNames(List unitNames) { - this.unitNames = unitNames; - } - - public List getReportInfos() { - return reportInfos; - } - - public void setReportInfos(List reportInfos) { - this.reportInfos = reportInfos; - } - - public void addUnitName( String unitName ) { - if( unitName == null ){ - return ; - } - - if( unitNames == null ){ - unitNames = new ArrayList(); - } - - if( !unitNames.contains( unitName )){ - unitNames.add( unitName ); - } - } - } - - public static class WoOkrWorkReportProcessLog extends OkrWorkReportProcessLog{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } - - public static class WoOkrWorkBaseInfo extends OkrWorkBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkBaseInfo.class, WoOkrWorkBaseInfo.class, null,JpaObject.FieldsInvisible); - - private List< WoOkrWorkBaseInfo > subWrapOutOkrWorkBaseInfos = null; - - private List< WoOkrWorkAuthorizeRecord > okrWorkAuthorizeRecords = null; - - private WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - - private String workOutType = "SUBWORK"; - private String workDetail = null; - private String dutyDescription = null; - private String landmarkDescription = null; - private String majorIssuesDescription = null; - private String progressAction = null; - private String progressPlan = null; - private String resultDescription = null; - private Boolean hasNoneSubmitReport = false; - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getSubWrapOutOkrWorkBaseInfos() { - return subWrapOutOkrWorkBaseInfos; - } - - public void setSubWrapOutOkrWorkBaseInfos(List subWrapOutOkrWorkBaseInfos) { - this.subWrapOutOkrWorkBaseInfos = subWrapOutOkrWorkBaseInfos; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseInfo workBaseInfo) { - if( this.subWrapOutOkrWorkBaseInfos == null ){ - this.subWrapOutOkrWorkBaseInfos = new ArrayList(); - } - if( !subWrapOutOkrWorkBaseInfos.contains( workBaseInfo )){ - subWrapOutOkrWorkBaseInfos.add( workBaseInfo ); - } - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - /** - * 判断是父级工作还是子工作 - * @return - */ - public String getWorkOutType() { - return workOutType; - } - - /** - * 判断是父级工作还是子工作 - * @param workOutType - */ - public void setWorkOutType(String workOutType) { - this.workOutType = workOutType; - } - - public List getOkrWorkAuthorizeRecords() { - return okrWorkAuthorizeRecords; - } - - public void setOkrWorkAuthorizeRecords(List okrWorkAuthorizeRecords) { - this.okrWorkAuthorizeRecords = okrWorkAuthorizeRecords; - } - - public WoOkrWorkAuthorizeRecord getOkrWorkAuthorizeRecord() { - return okrWorkAuthorizeRecord; - } - - public void setOkrWorkAuthorizeRecord(WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord) { - this.okrWorkAuthorizeRecord = okrWorkAuthorizeRecord; - } - - public Boolean getHasNoneSubmitReport() { - return hasNoneSubmitReport; - } - - public void setHasNoneSubmitReport(Boolean hasNoneSubmitReport) { - this.hasNoneSubmitReport = hasNoneSubmitReport; - } - - } - - public static class WoOkrWorkAuthorizeRecord extends OkrWorkAuthorizeRecord{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionReadProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionReadProcess.java deleted file mode 100644 index 67ab383e20..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionReadProcess.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionReadProcess; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskInfoIsNotForRead; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskNotExists; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskProcessPermission; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionTaskQueryById; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrTask; - -public class ActionReadProcess extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionReadProcess.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult< Wo > result = new ActionResult<>(); - OkrTask okrTask = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if(check){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionTaskIdEmpty(); - result.error( exception ); - } - } - - if(check){ - //判断待阅信息是否存在 - try{ - okrTask = okrTaskService.get(id); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionTaskQueryById( e , id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if(check){ - if( okrTask == null ){ - check = false; - Exception exception = new ExceptionTaskNotExists( id ); - result.error( exception ); - } - } - - if(check){ - //判断是否为待阅信息 - if( !"READ".equals( okrTask.getProcessType() )){ - check = false; - Exception exception = new ExceptionTaskInfoIsNotForRead( id ); - result.error( exception ); - } - } - - if(check){ - if( !okrUserCache.getLoginIdentityName() .equals( okrTask.getTargetIdentity() )){ - check = false; - Exception exception = new ExceptionTaskProcessPermission( okrUserCache.getLoginIdentityName(), id ); - result.error( exception ); - } - } - - if(check){ - try{//处理待阅信息 - okrTaskService.processRead( okrTask ); - result.setData( new Wo(id) ); - }catch( Exception e ){ - check = false; - Exception exception = new ExceptionReadProcess( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if(check){ - if( okrTask != null ) { - WrapInWorkDynamic.sendWithTask( - okrTask, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "阅知工作汇报", - "工作汇报阅知成功！" - ); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionSendSms.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionSendSms.java deleted file mode 100644 index 84e834ede0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/ActionSendSms.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.dataadapter.webservice.sms.SmsMessageOperator; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.entity.OkrWorkBaseInfo; - -/** - * 向指定的人员发送指定的短消息内容 - * @author O2LEE - * - */ -public class ActionSendSms extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionSendSms.class); - - protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String workId, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - EffectivePerson currentPerson = this.effectivePerson(request); - OkrWorkBaseInfo okrWorkBaseInfo = null; - WrapOutBoolean wrapOutBoolean = new WrapOutBoolean(); - Wi wrapIn = null; - Boolean check = true; - - if( workId == null || workId.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - - if( check ){ - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - - if( check ){ - try{ - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( workId ); - result.error( exception ); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - String person = wrapIn.getPerson(); - String identity = wrapIn.getIdentity(); - String message = wrapIn.getMessage(); - if( StringUtils.isNotEmpty( person )) { - SmsMessageOperator.sendWithPersonName(person, message); - wrapOutBoolean.setValue( true ); - result.setData( wrapOutBoolean ); - } - if( StringUtils.isNotEmpty( identity )) { - person = userManagerService.getPersonNameByIdentity(identity); - if( StringUtils.isNotEmpty( person )) { - SmsMessageOperator.sendWithPersonName( person, message ); - wrapOutBoolean.setValue( true ); - result.setData( wrapOutBoolean ); - } - } - } - return result; - } - - public static class Wi { - - @FieldDescribe("需要发送短信的人员姓名.") - private String person = null; - - @FieldDescribe("需要发送短信的人员身份.") - private String identity = null; - - @FieldDescribe("短信内容.") - private String message = null; - - public String getPerson() { - return person; - } - - public String getMessage() { - return message; - } - - public void setPerson(String person) { - this.person = person; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getIdentity() { - return identity; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/BaseAction.java deleted file mode 100644 index f01e70ff7d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/BaseAction.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrTaskService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.assemble.control.service.OkrWorkReportDetailInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; -import com.x.okr.assemble.control.service.OkrWorkReportTaskCollectService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrUserManagerService userManagerService = new OkrUserManagerService(); - protected OkrTaskService okrTaskService = new OkrTaskService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - protected OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - protected OkrWorkReportDetailInfoService okrWorkReportDetailInfoService = new OkrWorkReportDetailInfoService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrAnonymousTaskAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrAnonymousTaskAction.java deleted file mode 100644 index 03db370531..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrAnonymousTaskAction.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -/** - * 待办信息管理服务（匿名） - * - * @author O2LEE - * - */ -@Path("task") -@JaxrsDescribe("待办信息管理服务（匿名）") -public class OkrAnonymousTaskAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrAnonymousTaskAction.class); - - @JaxrsMethodDescribe(value = "查询指定用户的待办数量, 需要加上指定的流程的待办数量", action = ActionCountMyTask.class) - @GET - @Path("count/{flag}/callback/{funcName}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void countMyTask(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("用户信息标识") @PathParam("flag") String flag, - @JaxrsParameterDescribe("回调方法名") @PathParam("funcName") String funcName) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionCountMyTask().execute(request, effectivePerson, flag, funcName); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteCountMyTask got an exception.flag:" + flag); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAction.java deleted file mode 100644 index b5b39c4cce..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAction.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -/** - * 待办信息管理服务 - * - * @author O2LEE - * - */ -@Path("okrtask") -@JaxrsDescribe("待办信息管理服务") -public class OkrTaskAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrTaskAction.class); - - @JaxrsMethodDescribe(value = "获取登录用户的所有工作汇报汇总的内容", action = ActionListTaskCollect.class) - @GET - @Path("unit/reportTaskCollect/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void showTaskCollect(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("汇总待办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListTaskCollect().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListTaskCollect got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "处理指定的待阅信息", action = ActionReadProcess.class) - @GET - @Path("process/read/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void processRead(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("待办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionReadProcess().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteReadProcess got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取待办或者待阅信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("待办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据过滤条件列示我的待办列表,下一页", action = ActionListMyTaskNextWithFilter.class) - @PUT - @Path("filter/my/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyTaskNext(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyTaskNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ActionListMyTaskNextWithFilter got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "给指定处理人发送短消息提醒", action = ActionSendSms.class) - @PUT - @Path("sms/send/{workId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void sendSms(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作ID") @PathParam("workId") String workId, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionSendSms().execute(request, effectivePerson, workId, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute sendSms got an exception.workId:" + workId); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAdminAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAdminAction.java deleted file mode 100644 index b68e441486..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/OkrTaskAdminAction.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -/** - * 待办信息数据管理服务（管理员） - * - * @author O2LEE - * - */ -@Path("admin/okrtask") -@JaxrsDescribe("待办信息数据管理服务（管理员）") -public class OkrTaskAdminAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrTaskAdminAction.class); - - @JaxrsMethodDescribe(value = "根据ID删除待办待阅信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("待办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception."); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取待办待阅信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("待办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据过滤条件列表我的待办列表,下一页", action = ActionListNextWithFilter.class) - @PUT - @Path("filter/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListTaskNext(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据过滤条件列表我的待办列表,上一页", action = ActionListPrevWithFilter.class) - @PUT - @Path("filter/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListTaskPrev(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 4c57266ca0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionInsufficientPermissions.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionInsufficientPermissions.java deleted file mode 100644 index 6f0ce4204d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionInsufficientPermissions.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionInsufficientPermissions extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionInsufficientPermissions( String name, String role ) { - super("操作权限不足。Name:" + name + ", Role:" + role ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrOperationDynamicSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrOperationDynamicSave.java deleted file mode 100644 index 680c84fb3a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrOperationDynamicSave.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOkrOperationDynamicSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOkrOperationDynamicSave( Throwable e, String id ) { - super("系统在保存待办信息操作动态信息时发生异常。ID:" + id, e ); - } - - public ExceptionOkrOperationDynamicSave( Throwable e ) { - super("系统在保存待办信息操作动态信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrSystemAdminCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrSystemAdminCheck.java deleted file mode 100644 index 81700f5da1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionOkrSystemAdminCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOkrSystemAdminCheck extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOkrSystemAdminCheck( Throwable e, String userName ) { - super("系统在判断用户是否是OKR系统管理员时发生异常.Name:" + userName, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonNotExists.java deleted file mode 100644 index dfc1a276a0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionPersonNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionPersonNotExists( String flag ) { - super("用户信息不存在!Flag:" + flag ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonQueryByFlag.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonQueryByFlag.java deleted file mode 100644 index 5e89b5685c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionPersonQueryByFlag.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionPersonQueryByFlag extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionPersonQueryByFlag( Throwable e, String flag ) { - super("根据用户唯一标识查询用户信息时发生异常!Flag:" + flag ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionReadProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionReadProcess.java deleted file mode 100644 index 5287dd27fa..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionReadProcess.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReadProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReadProcess( Throwable e, String id ) { - super("系统在处理待阅信息时发生异常。 ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionSystemConfigQueryByCode.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionSystemConfigQueryByCode.java deleted file mode 100644 index 20d765fa93..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionSystemConfigQueryByCode.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigQueryByCode extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigQueryByCode( Throwable e, String code ) { - super("根据指定的Code查询系统配置时发生异常。Code:" + code, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskCountQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskCountQuery.java deleted file mode 100644 index fc1938a6c5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskCountQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskCountQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskCountQuery( Throwable e, String flag ) { - super("系统在根据用户姓名获取待办总数时发生异常!Flag:" + flag ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskDelete.java deleted file mode 100644 index b134d32863..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskDelete( Throwable e, String id ) { - super("系统根据ID删除指定的待办信息时发生异常!ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskIdEmpty.java deleted file mode 100644 index ff118ac221..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskIdEmpty() { - super("id为空，无法进行查询。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskInfoIsNotForRead.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskInfoIsNotForRead.java deleted file mode 100644 index ce2c43854a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskInfoIsNotForRead.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskInfoIsNotForRead extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskInfoIsNotForRead( String id ) { - super("您尝试处理的信息并不是待阅信息，无法进一步处理。!ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskListByTaskType.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskListByTaskType.java deleted file mode 100644 index d3eaf0d49a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskListByTaskType.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskListByTaskType extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskListByTaskType( Throwable e, String person ) { - super("系统根据待办类别查询待办信息时发生异常!Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskNotExists.java deleted file mode 100644 index 0d8938a815..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskNotExists.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskNotExists( String id ) { - super("指定的待办信息不存在!ID:" + id ); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskProcessPermission.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskProcessPermission.java deleted file mode 100644 index 157fddd31d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskProcessPermission.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskProcessPermission extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskProcessPermission( String person, String id ) { - super("您没有处理该条待阅的权限，请联系管理员! Person:"+person+", ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskQueryById.java deleted file mode 100644 index ce45037096..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionTaskQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskQueryById( Throwable e, String id ) { - super("系统根据ID查询指定的待办信息时发生异常!ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionUserNoLogin.java deleted file mode 100644 index f15b0082aa..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkNotExists.java deleted file mode 100644 index b761d6115f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("具体工作信息不存在!ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkQueryById.java deleted file mode 100644 index 8fd3f1862a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkQueryById( Throwable e, String id ) { - super("系统根据ID查询指定的具体工作信息时发生异常!ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 3c1576f3b0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtask/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtask.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionDelete.java deleted file mode 100644 index 8078d01c53..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionDelete.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrtask.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionInsufficientPermissions; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionOkrSystemAdminCheck; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledDelete; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledNotExists; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledQueryById; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrTaskHandled; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDelete.class); - - protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String id) - throws Exception { - ActionResult result = new ActionResult<>(); - OkrTaskHandled okrTaskHandled = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new ExceptionUserNoLogin(effectivePerson.getDistinguishedName()); - result.error(exception); - } - try { - if ( !okrUserInfoService.getIsOkrManager( effectivePerson.getDistinguishedName())) { - check = false; - Exception exception = new ExceptionInsufficientPermissions(effectivePerson.getDistinguishedName(), ThisApplication.OKRMANAGER); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionOkrSystemAdminCheck(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - if (check) { - if (id == null || id.isEmpty()) { - check = false; - Exception exception = new ExceptionTaskHandledIdEmpty(); - result.error(exception); - } - } - if (check) { - try { - okrTaskHandled = okrTaskHandledService.get(id); - if (okrTaskHandled == null) { - check = false; - Exception exception = new ExceptionTaskHandledNotExists(id); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionTaskHandledQueryById(e, id); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - try { - okrTaskHandledService.delete(id); - result.setData(new Wo(id)); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionTaskHandledDelete(e, id); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - if ("工作汇报".equals(okrTaskHandled.getDynamicObjectType())) { - try { - List workTypeList = new ArrayList(); - workTypeList.add(okrTaskHandled.getWorkType()); - okrWorkReportTaskCollectService.checkReportCollectTask(okrTaskHandled.getTargetIdentity(), - workTypeList); - } catch (Exception e) { - logger.warn("已办信息删除成功，但对汇报者进行汇报已办汇总发生异常。"); - logger.error(e); - } - } - } - if (check) { - if( okrTaskHandled != null ) { - WrapInWorkDynamic.sendWithTaskHandled( - okrTaskHandled, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginUserName(), - "删除已办已阅", - "管理员删除已办已阅操作成功！" - ); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionGet.java deleted file mode 100644 index 882dc2c17d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionGet.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledNotExists; -import com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception.ExceptionTaskHandledQueryById; -import com.x.okr.entity.OkrTaskHandled; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrTaskHandled okrTaskHandled = null; - Boolean check = true; - if(check){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionTaskHandledIdEmpty(); - result.error( exception ); - } - } - if( check ){ - try { - okrTaskHandled = okrTaskHandledService.get( id ); - if( okrTaskHandled != null ){ - wrap = Wo.copier.copy( okrTaskHandled ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionTaskHandledNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionTaskHandledQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrTaskHandled{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopiercopier = WrapCopierFactory.wo( OkrTaskHandled.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListNextWithFilter.java deleted file mode 100644 index 5f47fd50b4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListNextWithFilter.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrTaskHandled; - -public class ActionListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("dynamicObjectTitle", wrapIn.getFilterLikeContent()); - likesMap.put("targetName", wrapIn.getFilterLikeContent()); - likesMap.put("targetIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("dynamicObjectType", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, true, wrapIn.getOrder()); - } catch (Exception e) { - check = false; - result.error(e); - logger.warn("系统查询已办信息列表时发生异常!"); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class Wo extends OkrTaskHandled { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrTaskHandled.class, Wo.class, null, - Wo.Excludes); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListPrevWithFilter.java deleted file mode 100644 index 2801a608af..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/ActionListPrevWithFilter.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrconfigsercretary.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrTaskHandled; - -public class ActionListPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListPrevWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("dynamicObjectTitle", wrapIn.getFilterLikeContent()); - likesMap.put("targetName", wrapIn.getFilterLikeContent()); - likesMap.put("targetIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("dynamicObjectType", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListPrev(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, true, wrapIn.getOrder()); - } catch (Exception e) { - check = false; - result.error(e); - logger.warn("系统查询已办信息列表时发生异常!"); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class Wo extends OkrTaskHandled { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrTaskHandled.class, Wo.class, null, - Wo.Excludes); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/BaseAction.java deleted file mode 100644 index b16f46a648..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/BaseAction.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrTaskHandledService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.assemble.control.service.OkrWorkReportTaskCollectService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrUserManagerService userManagerService = new OkrUserManagerService(); - protected OkrTaskHandledService okrTaskHandledService = new OkrTaskHandledService(); - protected OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAction.java deleted file mode 100644 index 84796f80b0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAction.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrtaskhandled") -@JaxrsDescribe("已办已阅信息管理服务") -public class OkrTaskHandledAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrTaskHandledAction.class); - - @JaxrsMethodDescribe(value = "根据ID获取已办已阅信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("已办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAdminAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAdminAction.java deleted file mode 100644 index 2420e6aea0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/OkrTaskHandledAdminAction.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("admin/okrtaskhandled") -@JaxrsDescribe("已办已阅信息数据管理服务（管理员）") -public class OkrTaskHandledAdminAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrTaskHandledAdminAction.class); - - @JaxrsMethodDescribe(value = "根据ID获取已办已阅信息", action = ActionListNextWithFilter.class) - @PUT - @Path("filter/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListTaskNext(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取已办已阅信息", action = ActionListPrevWithFilter.class) - @PUT - @Path("filter/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListTaskPrev(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除已办已阅信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("已办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception."); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取已办已阅信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("已办信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 7df070da6a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionInsufficientPermissions.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionInsufficientPermissions.java deleted file mode 100644 index 61dba5bfa2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionInsufficientPermissions.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionInsufficientPermissions extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionInsufficientPermissions( String name, String role ) { - super("操作权限不足。Name:" + name + ", Role:" + role ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionOkrSystemAdminCheck.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionOkrSystemAdminCheck.java deleted file mode 100644 index 5de80141f3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionOkrSystemAdminCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionOkrSystemAdminCheck extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionOkrSystemAdminCheck( Throwable e, String userName ) { - super("系统在判断用户是否是OKR系统管理员时发生异常.Name:" + userName, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledDelete.java deleted file mode 100644 index e660922ba2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskHandledDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskHandledDelete( Throwable e, String id ) { - super("系统根据ID删除指定的已办信息时发生异常!ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledIdEmpty.java deleted file mode 100644 index 3b555e67f4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskHandledIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskHandledIdEmpty() { - super("id为空，无法进行查询。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledNotExists.java deleted file mode 100644 index 63301be89b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledNotExists.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskHandledNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskHandledNotExists( String id ) { - super("指定的已办信息不存在!ID:" + id ); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledQueryById.java deleted file mode 100644 index 650d25cee4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionTaskHandledQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionTaskHandledQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionTaskHandledQueryById( Throwable e, String id ) { - super("系统根据ID查询指定的已办信息时发生异常!ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionUserNoLogin.java deleted file mode 100644 index ba5a56e13c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 29fa4aab17..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrtaskhandled/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrtaskhandled.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/ActionGet.java deleted file mode 100644 index 7cac3d7dc5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/ActionGet.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception.ExceptionAuthorizeRecordIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception.ExceptionAuthorizeRecordNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception.ExceptionAuthorizeRecordQueryById; -import com.x.okr.entity.OkrWorkAuthorizeRecord; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionAuthorizeRecordIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.get( id ); - if( okrWorkAuthorizeRecord != null ){ - wrap = Wo.copier.copy( okrWorkAuthorizeRecord ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionAuthorizeRecordNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionAuthorizeRecordQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrWorkAuthorizeRecord{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkAuthorizeRecord.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/BaseAction.java deleted file mode 100644 index c755986de4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/BaseAction.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrWorkAuthorizeRecordService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkAuthorizeRecordService okrWorkAuthorizeRecordService = new OkrWorkAuthorizeRecordService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/OkrWorkAuthorizeRecordAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/OkrWorkAuthorizeRecordAction.java deleted file mode 100644 index 30631676b1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/OkrWorkAuthorizeRecordAction.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrworkauthorizerecord") -@JaxrsDescribe("工作授权记录信息管理服务") -public class OkrWorkAuthorizeRecordAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrWorkAuthorizeRecordAction.class); - - @JaxrsMethodDescribe(value = "根据ID获取工作授权记录信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作授权记录信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception.id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordIdEmpty.java deleted file mode 100644 index 0a7b1c4d38..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAuthorizeRecordIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAuthorizeRecordIdEmpty() { - super("id为空，无法进行查询。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordNotExists.java deleted file mode 100644 index ac858c6f66..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAuthorizeRecordNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAuthorizeRecordNotExists( String id ) { - super("指定ID的授权记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordQueryById.java deleted file mode 100644 index 6350b96c69..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionAuthorizeRecordQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAuthorizeRecordQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAuthorizeRecordQueryById( Throwable e, String id ) { - super("查询指定ID的授权记录时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index b6c7a91ebe..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionUserNoLogin.java deleted file mode 100644 index ea2a37477d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkauthorizerecord/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkauthorizerecord.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionAppraise.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionAppraise.java deleted file mode 100644 index 092483481c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionAppraise.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.dataadapter.workflow.WorkFlowReaderAdder; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWfWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionAppraise extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionAppraise.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String workId, String wf_workId ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - WrapOutBoolean wrapOutBoolean = new WrapOutBoolean(); - wrapOutBoolean.setValue( false ); - List readerIdentities = null; - - if( workId == null || workId.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - - if( wf_workId == null || wf_workId.isEmpty() ){ - check = false; - Exception exception = new ExceptionWfWorkIdEmpty(); - result.error( exception ); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if(check){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( workId ); - result.error( exception ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if(check){ - try { - check = okrWorkBaseInfoService.bindAppraiseWfId( workId, wf_workId ); - wrapOutBoolean.setValue( check ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "为工作绑定考核流程ID时发生异常。ID：" + workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if(check){ - try { - readerIdentities = okrWorkPersonService.listWorkPersonIdentitiesWithWorkId(workId); - if(ListTools.isNotEmpty(readerIdentities)) { - List addIdentities = new ArrayList<>(); - for( String identity: readerIdentities) { - if( !addIdentities.contains(identity)) { - addIdentities.add(identity); - } - } - new WorkFlowReaderAdder().add(wf_workId, addIdentities ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "为流程添加读者权限时发生异常。ID：" + wf_workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - result.setData(wrapOutBoolean); - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionArchive.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionArchive.java deleted file mode 100644 index 6b6de3e422..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionArchive.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionArchive extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionArchive.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrUserCache okrUserCache = null; - Boolean check = true; - - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if(check){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrWorkBaseInfoOperationService.archive( id ); - result.setData( new Wo( id ) ); - - if( okrWorkBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkInfo( okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "归档具体工作", - "具体工作归档成功！" - ); - } - }catch(Exception e){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID列表查询附件信息列表发生异常. ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDelete.java deleted file mode 100644 index b98e030c14..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDelete.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkCanNotDelete; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - private OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - /** - * 删除工作服务 - * @param effectivePerson - * @param id - * @return - * @throws Exception - */ - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - List ids = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - Boolean check = true; - - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - try { - ids = okrWorkBaseInfoService.getSubNormalWorkBaseInfoIds( id ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定工作ID查询所有下级工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( ids != null && !ids.isEmpty()){ - check = false; - Exception exception = new ExceptionWorkCanNotDelete( ids ); - result.error( exception ); - } - } - if( check ){ - try{ - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrWorkBaseInfoOperationService.deleteByWorkId( id ); - result.setData( new Wo(id) ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "工作删除过程中发生异常。"+id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrWorkBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkInfo( okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "删除具体工作", - "具体工作删除成功！" - ); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeleteForce.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeleteForce.java deleted file mode 100644 index 51b4844ca0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeleteForce.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionDeleteForce extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDeleteForce.class ); - private OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - if( check ){ - try{ - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrWorkBaseInfoOperationService.deleteForce( id ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "工作删除过程中发生异常。"+id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrWorkBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkInfo( okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "删除具体工作", - "具体工作删除成功！" - ); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeploy.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeploy.java deleted file mode 100644 index cc2426e46a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionDeploy.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.dataadapter.webservice.sms.SmsMessageOperator; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoDeployService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionDeploy extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDeploy.class ); - private OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - private OkrWorkBaseInfoDeployService okrWorkBaseInfoDeployService = new OkrWorkBaseInfoDeployService(); - - /** - * 传入工作ID, 进行工作的部署 - * @param effectivePerson - * @param wrapIn - * @return - * @throws Exception - */ - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - //前端传递所有需要部署的工作ID - List workIds = null; - List okrWorkBaseInfoList = new ArrayList(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - String centerId = null; - Boolean check = true; - WiOkrWorkBaseInfo wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, WiOkrWorkBaseInfo.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - workIds = wrapIn.getWorkIds(); - if( workIds == null || workIds.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - //对wrapIn里的信息进行校验 - if( check && okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - for ( String id : workIds ) { - logger.debug( "system checking work, id:" + id ); - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - // 判断工作信息是否全都存在 - if ( okrWorkBaseInfo == null ) { - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - break; - } - okrWorkBaseInfoList.add( okrWorkBaseInfo ); - centerId = okrWorkBaseInfo.getCenterId(); - // 判断中心工作信息是否存在 - if (centerId != null) { - okrCenterWorkInfo = okrCenterWorkInfoService.get( centerId ); - if ( okrCenterWorkInfo == null ) { - check = false; - Exception exception = new ExceptionCenterWorkNotExists( centerId ); - result.error( exception ); - break; - } - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统校验需要部署的工作信息合法性时发生异常! WorkId:" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - break; - } - } - } - //当所有的校验都通过后，再进行工作的部署 - if( check ){ - try { - okrWorkBaseInfoDeployService.deploy( workIds, okrUserCache.getLoginIdentityName() ); - } catch( Exception e ){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "部署具体工作过程中发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrWorkBaseInfoOperationService.createTasks( workIds, okrUserCache.getLoginIdentityName() ); - }catch( Exception e ){ - logger.warn( "system createTasks got an exception." ); - logger.error( e ); - } - } - - if( check ){ - for( OkrWorkBaseInfo _okrWorkBaseInfo : okrWorkBaseInfoList ){ - //工作的责任者接收短信 - SmsMessageOperator.sendWithPersonName( _okrWorkBaseInfo.getResponsibilityEmployeeName(), "您有工作'"+_okrWorkBaseInfo.getTitle()+"'，请及时办理！"); - - //工作协助者接收短信 - if( ListTools.isNotEmpty( _okrWorkBaseInfo.getCooperateEmployeeNameList()) ) { - for( String name : _okrWorkBaseInfo.getCooperateEmployeeNameList() ) { - SmsMessageOperator.sendWithPersonName( name, "您有工作'"+_okrWorkBaseInfo.getTitle()+"'，请协助办理！"); - } - } - - WrapInWorkDynamic.sendWithWorkInfo( _okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "部署具体工作", - "具体工作部署成功！" - ); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGet.java deleted file mode 100644 index 826beed8c8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGet.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - WoOkrWorkBaseInfo wrap = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - List ids = null; - String dateTime = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - List okrWorkAuthorizeRecordList = null; - WoOkrWorkDeployAuthorizeRecord wrapOutOkrWorkDeployAuthorizeRecord = null; - List wrapOutOkrWorkDeployAuthorizeRecordList = new ArrayList<>(); - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if(check){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - if( okrWorkBaseInfo != null ){ - wrap = WoOkrWorkBaseInfo.copier.copy( okrWorkBaseInfo ); - }else{ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - try { - okrWorkDetailInfo = okrWorkDetailInfoService.get( id ); - if( okrWorkDetailInfo != null ){ - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - wrap.setDutyDescription( okrWorkDetailInfo.getDutyDescription() ); - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setMajorIssuesDescription( okrWorkDetailInfo.getMajorIssuesDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setProgressPlan( okrWorkDetailInfo.getProgressPlan() ); - wrap.setResultDescription( okrWorkDetailInfo.getResultDescription() ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的工作详细信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - try { - //获取该工作和当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( okrWorkBaseInfo.getId(), okrUserCache.getLoginIdentityName(), "正常" ); - if( okrWorkAuthorizeRecord != null ){ - wrap.setOkrWorkAuthorizeRecord( WoOkrWorkAuthorizeRecord.copier.copy( okrWorkAuthorizeRecord ) ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID以及授权相关人信息查询工作最后一次授权信息发生异常。Person: "+ okrUserCache.getLoginIdentityName() +", ID：" + okrWorkBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - try { - //获取该工作所有的授权信息 - ids = okrWorkAuthorizeRecordService.listByWorkId( id ); - if( ids != null && !ids.isEmpty() ){ - okrWorkAuthorizeRecordList = okrWorkAuthorizeRecordService.list( ids ); - if( okrWorkAuthorizeRecordList != null ){ - for( OkrWorkAuthorizeRecord _okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getWorkId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作授权" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "AUTHORIZE" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( _okrWorkAuthorizeRecord.getDelegateDateTimeStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( _okrWorkAuthorizeRecord.getTargetIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( _okrWorkAuthorizeRecord.getDelegateOpinion() ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - if( _okrWorkAuthorizeRecord.getTakebackDateTime() != null && "已收回".equals( _okrWorkAuthorizeRecord.getStatus() )){ - try{ - dateTime = dateOperation.getDate( _okrWorkAuthorizeRecord.getTakebackDateTime(), "yyyy-MM-dd HH:mm:ss"); - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getWorkId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "授权收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "TACKBACK" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( dateTime ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - }catch( Exception e ){ - logger.warn( "授权收回时间格式化异常, tackbacktime:" + _okrWorkAuthorizeRecord.getTakebackDateTime() ); - logger.error( e ); - } - } - SortTools.asc( wrapOutOkrWorkDeployAuthorizeRecordList, "operationTime" ); - wrap.setOkrWorkAuthorizeRecords( wrapOutOkrWorkDeployAuthorizeRecordList ); - } - } - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID以及授权相关人信息查询工作最后一次授权信息发生异常。ID：" + okrWorkBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - result.setData(wrap); - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetForAdmin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetForAdmin.java deleted file mode 100644 index fd83474bbc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetForAdmin.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionGetForAdmin extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetForAdmin.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - WoOkrWorkBaseInfo wrap = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - List ids = null; - String dateTime = null; - List okrWorkAuthorizeRecordList = null; - WoOkrWorkDeployAuthorizeRecord wrapOutOkrWorkDeployAuthorizeRecord = null; - List wrapOutOkrWorkDeployAuthorizeRecordList = new ArrayList<>(); - Boolean check = true; - - if(check){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - if(check){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get(id); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - if( okrWorkBaseInfo != null ){ - try { - wrap = WoOkrWorkBaseInfo.copier.copy( okrWorkBaseInfo ); - result.setData(wrap); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "将查询结果转换为可以输出的数据信息时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - } - if(check){ - try { - okrWorkDetailInfo = okrWorkDetailInfoService.get( id ); - } catch ( Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的工作详细信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - //获取该工作所有的授权信息 - try { - ids = okrWorkAuthorizeRecordService.listByWorkId( id ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID以及授权相关人信息查询工作最后一次授权信息发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( ids != null && !ids.isEmpty() ){ - try { - okrWorkAuthorizeRecordList = okrWorkAuthorizeRecordService.list( ids ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据ID列表查询工作授权信息列表发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if( check ){ - if( okrWorkAuthorizeRecordList != null ){ - for( OkrWorkAuthorizeRecord _okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getWorkId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作授权" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "AUTHORIZE" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( _okrWorkAuthorizeRecord.getDelegateDateTimeStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( _okrWorkAuthorizeRecord.getTargetIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( _okrWorkAuthorizeRecord.getDelegateOpinion() ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - if( _okrWorkAuthorizeRecord.getTakebackDateTime() != null && "已收回".equals( _okrWorkAuthorizeRecord.getStatus() )){ - try{ - dateTime = dateOperation.getDate( _okrWorkAuthorizeRecord.getTakebackDateTime(), "yyyy-MM-dd HH:mm:ss"); - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getWorkId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "授权收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "TACKBACK" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( dateTime ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - }catch( Exception e ){ - logger.warn( "授权收回时间格式化异常, tackbacktime:" + _okrWorkAuthorizeRecord.getTakebackDateTime() ); - logger.error( e ); - } - } - SortTools.asc( wrapOutOkrWorkDeployAuthorizeRecordList, "operationTime" ); - wrap.setOkrWorkAuthorizeRecords( wrapOutOkrWorkDeployAuthorizeRecordList ); - } - } - } - if( check ){ - if( okrWorkDetailInfo != null ){ - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - wrap.setDutyDescription( okrWorkDetailInfo.getDutyDescription() ); - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setMajorIssuesDescription( okrWorkDetailInfo.getMajorIssuesDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setProgressPlan( okrWorkDetailInfo.getProgressPlan() ); - wrap.setResultDescription( okrWorkDetailInfo.getResultDescription() ); - result.setData(wrap); - }else{ - logger.warn( "system can not get any okrWorkDetailInfo by {'id':'"+id+"'}. " ); - } - } - - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetMyWorkStatistic.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetMyWorkStatistic.java deleted file mode 100644 index 98d3ce3405..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetMyWorkStatistic.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; - -public class ActionGetMyWorkStatistic extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetMyWorkStatistic.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = new Wo(); - - Long responWorkTotal = 0L; - Long responProcessingWorkCount = 0L; - Long responCompletedWorkCount = 0L; - Long responOvertimeWorkCount = 0L; - Long draftWorkCount = 0L; - - Long overtimeResponWorkCount = 0L; - Long overtimeCooperWorkCount = 0L; - Long overtimeDeployWorkCount = 0L; - - Long overtimenessResponWorkCount = 0L; - Long overtimenessCooperWorkCount = 0L; - Long overtimenessDeployWorkCount = 0L; - - - Double percent = 0.0; - String identity = null; - List status = new ArrayList(); - status.add( "正常" ); - Boolean check = true; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - identity = okrUserCache.getLoginIdentityName() ; - } - //根据登录用户身份进行数据统计查询 - if( check ){ - try{ - //我负责的工作总数 - responWorkTotal = okrWorkPersonService.getWorkTotalByCenterId( identity, status, "责任者" ); - //我负责的执行中的工作总数 - responProcessingWorkCount = okrWorkPersonService.getProcessingWorkCountByCenterId( identity, status, "责任者" ); - //我负责的完成的工作总数 - responCompletedWorkCount = okrWorkPersonService.getCompletedWorkCountByCenterId( identity, status, "责任者" ); - //我负责的已超期的工作总数 - responOvertimeWorkCount = okrWorkPersonService.getOvertimeWorkCountByCenterId( identity, status, "责任者" ); - //我的工作草稿数 - draftWorkCount = okrWorkPersonService.getDraftWorkCountByCenterId( identity, status, "责任者" ); - //已超期的工作中， 我部署的，我负责的， 我协助的的 - overtimeResponWorkCount = okrWorkPersonService.getOvertimeWorkCountByCenterId( identity, status, "责任者" ); - overtimeCooperWorkCount = okrWorkPersonService.getOvertimeWorkCountByCenterId( identity, status, "协助者" ); - overtimeDeployWorkCount = okrWorkPersonService.getOvertimeWorkCountByCenterId( identity, status, "部署者" ); - //未超期的工作中， 我部署的，我负责的， 我协助的的 - overtimenessResponWorkCount = okrWorkPersonService.getOvertimenessWorkCountByCenterId( identity, status, "责任者" ); - overtimenessCooperWorkCount = okrWorkPersonService.getOvertimenessWorkCountByCenterId( identity, status, "协助者" ); - overtimenessDeployWorkCount = okrWorkPersonService.getOvertimenessWorkCountByCenterId( identity, status, "部署者" ); - - if( responWorkTotal > 0 ){ - percent = ( (double)responWorkTotal - (double)responOvertimeWorkCount ) / (double)responWorkTotal; - } - }catch(Exception e){ - logger.warn( "system count my okrWorkBaseInfo got an exception." ); - result.error( e ); - } - } - - if( check ){ - wrap.setPercent( percent ); - wrap.setResponWorkTotal(responWorkTotal); - wrap.setResponProcessingWorkCount(responProcessingWorkCount); - wrap.setResponCompletedWorkCount(responCompletedWorkCount); - wrap.setDraftWorkCount( draftWorkCount ); - - wrap.setOvertimeResponWorkCount(overtimeResponWorkCount); - wrap.setOvertimeCooperWorkCount(overtimeCooperWorkCount); - wrap.setOvertimeDeployWorkCount(overtimeDeployWorkCount); - - wrap.setOvertimenessResponWorkCount(overtimenessResponWorkCount); - wrap.setOvertimenessCooperWorkCount(overtimenessCooperWorkCount); - wrap.setOvertimenessDeployWorkCount(overtimenessDeployWorkCount); - - } - result.setData( wrap ); - - return result; - } - - public static class Wo { - - public static List Excludes = new ArrayList(); - - private String name = null; - private Long responWorkTotal = 0L; - private Long responProcessingWorkCount = 0L; - private Long responCompletedWorkCount = 0L; - private Long draftWorkCount = 0L; - private Long overtimeResponWorkCount = 0L; - private Long overtimeCooperWorkCount = 0L; - private Long overtimeDeployWorkCount = 0L; - private Long overtimenessResponWorkCount = 0L; - private Long overtimenessCooperWorkCount = 0L; - private Long overtimenessDeployWorkCount = 0L; - private Double percent = 0.0; - public String getName() { - return name; - } - public Long getResponWorkTotal() { - return responWorkTotal; - } - public Long getResponProcessingWorkCount() { - return responProcessingWorkCount; - } - public Long getResponCompletedWorkCount() { - return responCompletedWorkCount; - } - public Long getDraftWorkCount() { - return draftWorkCount; - } - public Long getOvertimeResponWorkCount() { - return overtimeResponWorkCount; - } - public Long getOvertimeCooperWorkCount() { - return overtimeCooperWorkCount; - } - public Long getOvertimeDeployWorkCount() { - return overtimeDeployWorkCount; - } - public Long getOvertimenessResponWorkCount() { - return overtimenessResponWorkCount; - } - public Long getOvertimenessCooperWorkCount() { - return overtimenessCooperWorkCount; - } - public Long getOvertimenessDeployWorkCount() { - return overtimenessDeployWorkCount; - } - public Double getPercent() { - return percent; - } - public void setName(String name) { - this.name = name; - } - public void setResponWorkTotal(Long responWorkTotal) { - this.responWorkTotal = responWorkTotal; - } - public void setResponProcessingWorkCount(Long responProcessingWorkCount) { - this.responProcessingWorkCount = responProcessingWorkCount; - } - public void setResponCompletedWorkCount(Long responCompletedWorkCount) { - this.responCompletedWorkCount = responCompletedWorkCount; - } - public void setDraftWorkCount(Long draftWorkCount) { - this.draftWorkCount = draftWorkCount; - } - public void setOvertimeResponWorkCount(Long overtimeResponWorkCount) { - this.overtimeResponWorkCount = overtimeResponWorkCount; - } - public void setOvertimeCooperWorkCount(Long overtimeCooperWorkCount) { - this.overtimeCooperWorkCount = overtimeCooperWorkCount; - } - public void setOvertimeDeployWorkCount(Long overtimeDeployWorkCount) { - this.overtimeDeployWorkCount = overtimeDeployWorkCount; - } - public void setOvertimenessResponWorkCount(Long overtimenessResponWorkCount) { - this.overtimenessResponWorkCount = overtimenessResponWorkCount; - } - public void setOvertimenessCooperWorkCount(Long overtimenessCooperWorkCount) { - this.overtimenessCooperWorkCount = overtimenessCooperWorkCount; - } - public void setOvertimenessDeployWorkCount(Long overtimenessDeployWorkCount) { - this.overtimenessDeployWorkCount = overtimenessDeployWorkCount; - } - public void setPercent(Double percent) { - this.percent = percent; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetWorkOperationWithId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetWorkOperationWithId.java deleted file mode 100644 index 69268def2e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionGetWorkOperationWithId.java +++ /dev/null @@ -1,323 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionSystemWorkManagerCheck; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionGetWorkOperationWithId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetWorkOperationWithId.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String workId ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - List ids = null; - Wo wrap = new Wo(); - List workOperation = null; - List workProcessIndentity = null; - - Boolean viewAble = true;//是否允许查看工作详情 - Boolean editAble = false; //是否允许编辑工作信息 - Boolean splitAble = false; //是否允许拆解工作 - Boolean authorizeAble = false; //是否允许进行授权 - Boolean tackbackAble = false; //是否允许被收回 - Boolean reportAble = false; //是否允许进行汇报 - Boolean deleteAble = false; //是否允许删除工作 - Boolean archiveAble = false; //是否允许归档工作 - Boolean appraiseAble = false; //是否允许启动工作考核 - Boolean progressAdjust = false; //是否允许调整工作进展 - Boolean isTopUnitWorkAdmin = false; //是否是顶层组织工作管理员 - - String work_dismantling = "CLOSE"; - String work_authorize = "CLOSE"; - String report_usercreate = "CLOSE"; - Integer appraise_max_times = 0; - Integer appraiseTimes = 0; - - String APPRAISE_MAX_TIMES = "0"; - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - try { - work_dismantling = okrConfigSystemService.getValueWithConfigCode( "WORK_DISMANTLING" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_DISMANTLING" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - APPRAISE_MAX_TIMES = okrConfigSystemService.getValueWithConfigCode( "APPRAISE_MAX_TIMES" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "APPRAISE_MAX_TIMES" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - work_authorize = okrConfigSystemService.getValueWithConfigCode( "WORK_AUTHORIZE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_AUTHORIZE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - report_usercreate = okrConfigSystemService.getValueWithConfigCode( "REPORT_USERCREATE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "REPORT_USERCREATE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - appraise_max_times = Integer.parseInt( APPRAISE_MAX_TIMES ); - } catch (Exception e) { - e.printStackTrace(); - logger.warn("系统配置APPRAISE_MAX_TIMES不是合法数字。" ); - appraise_max_times = 0; - } - } - - if( check ){ - try { - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - isTopUnitWorkAdmin = true; - } - } catch (Exception e ) { - Exception exception = new ExceptionSystemWorkManagerCheck( e, okrUserCache.getLoginIdentityName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo != null ){ - workProcessIndentity = new ArrayList<>(); - workOperation = new ArrayList<>(); - - appraiseAble = false; - viewAble = true;//是否允许查看工作详情 - editAble = false; //是否允许编辑工作信息 - splitAble = false; //是否允许拆解工作 - authorizeAble = false; //是否允许进行授权 - tackbackAble = false; //是否允许被收回 - reportAble = false; //是否允许进行汇报 - deleteAble = false; //是否允许删除工作 - - if( okrWorkBaseInfo.getAppraiseTimes() == null ) { - appraiseTimes = 0; - } - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){ - //如果用户是管理,或者是部署者,可以对执行中的，不是草稿的工作进行工作进度调整 - if( !"草稿".equals( okrWorkBaseInfo.getWorkProcessStatus() ) && !"已归档".equals( okrWorkBaseInfo.getStatus() ) ){ - progressAdjust = true; - //如果未归档的工作，工作管理员可以启动考核 - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - if( !"审核中".equals( okrWorkBaseInfo.getCurrentAppraiseStatus() )) { - if( appraise_max_times > 0 && appraiseTimes < appraise_max_times ) { - appraiseAble = true; - } - } - } - } - } - - //判断工作是否已经完成 - if( okrWorkBaseInfo.getIsCompleted() || okrWorkBaseInfo.getOverallProgress() == 1 ) { - workProcessIndentity.add( "COMPLETED" );//工作已经完成 - } - //获取该工作中当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( workId, okrUserCache.getLoginIdentityName(), null ); - if( okrWorkAuthorizeRecord != null ){ - //工作授权状态: NONE(未授权)|AUTHORING(授权中)|TACKBACK(已收回)|CANCEL(已失效) - if( "正常".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZE"); - //要判断一下,当前用户是授权人,还是承担人 - if( okrUserCache.getLoginIdentityName().equals( okrWorkAuthorizeRecord.getDelegatorIdentity() )){//授权人 - tackbackAble = true; - } - }else if( "已失效".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZECANCEL"); - }else if( "已收回".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("TACKBACK"); - } - } - - //判断工作处理职责身份: NONE(无权限)|VIEW(观察者)|READ(阅知者)|COOPERATE(协助者)|RESPONSIBILITY(责任者) - workProcessIndentity.add("VIEW");//能查出来肯定可见 - - viewAble = true; - if ( okrWorkProcessIdentityService.isMyDeployWork( okrUserCache.getLoginIdentityName(), workId )){ - workProcessIndentity.add("DEPLOY");//判断工作是否由我部署 - if( "草稿".equals( okrWorkBaseInfo.getWorkProcessStatus() )){ - editAble = true; //工作的部署者可以进行工作信息编辑， 草稿状态下可编辑，部署下去了就不能编辑了 - }else{ - if( !"已归档".equals( okrWorkBaseInfo.getStatus() )){ - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - archiveAble = true; - } - } - } - try{ - //部署者在该工作没有部署下级工作（被下级拆解）的情况下,如果工作未被归档，可以删除 - ids = okrWorkBaseInfoService.getSubNormalWorkBaseInfoIds( workId ); - if( ids == null || ids.isEmpty() ){ - if( !"已归档".equals( okrWorkBaseInfo.getStatus() )){ - deleteAble = true; //部署者的工作 在 未被拆解和未被授权的情况下,可以被删除 - }else { - if( !workProcessIndentity.contains("ARCHIVE")) { - workProcessIndentity.add("ARCHIVE");//工作已归档 - } - } - } - }catch( Exception e ){ - logger.warn( "system list sub work ids by workId got an exception."); - logger.error( e ); - } - } - if ( okrWorkProcessIdentityService.isMyReadWork( okrUserCache.getLoginIdentityName(), workId )){ - workProcessIndentity.add("READ");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyCooperateWork( okrUserCache.getLoginIdentityName(), workId )){ - workProcessIndentity.add("COOPERATE");//判断工作是否由我协助 - } - if ( okrWorkProcessIdentityService.isMyResponsibilityWork( okrUserCache.getLoginIdentityName(), workId )){ - workProcessIndentity.add("RESPONSIBILITY");//判断工作是否由我负责 - //如果该工作未归档 ，正常执行中，那么责任者可以进行工作授权 - if( !"已归档".equalsIgnoreCase( okrWorkBaseInfo.getStatus() ) ){ - if( !okrWorkBaseInfo.getIsCompleted() ){ - //未完成的工作 - if( !tackbackAble ){ - authorizeAble = true; - } - reportAble = true; - splitAble = true; - } - }else { - if( !workProcessIndentity.contains("ARCHIVE")) { - workProcessIndentity.add("ARCHIVE");//工作已归档 - } - } - } - - if( viewAble ){ - workOperation.add( "VIEW" ); - } - if( editAble ){ - workOperation.add( "EDIT" ); - } - if( splitAble ){ - if( "OPEN".equalsIgnoreCase( work_dismantling )){ - workOperation.add( "SPLIT" ); - } - } - if( authorizeAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "AUTHORIZE" ); - } - } - if( tackbackAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "TACKBACK" ); - } - } - if( reportAble ){ - if( "OPEN".equalsIgnoreCase( report_usercreate )){ - workOperation.add( "REPORT" ); - } - } - if( archiveAble ){ - workOperation.add( "ARCHIVE" ); - } - if( progressAdjust ){ - workOperation.add( "PROGRESS" ); - } - if( deleteAble ){ - workOperation.add( "DELETE" ); - } - if( appraiseAble ){ - workOperation.add( "APPRAISE" ); - } - wrap.setWorkProcessIdentity( workProcessIndentity ); - wrap.setOperation( workOperation ); - } - result.setData( wrap ); - }catch(Exception e){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据条件进行数据列表查询时发生异常!" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - result.setCount( 0L ); - } - return result; - } - - public static class Wo { - - @FieldDescribe("工作处理职责身份(多值): AUTHORZE(授权中)|TACKBACK(授权收回)|AUTHORIZECANCEL(授权失效)|VIEW(观察者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)") - private List workProcessIdentity = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):VIEW|EDIT|SPLIT|AUTHORIZE|TACKBACK|REPORT|DELETE|") - private List operation = null; - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public void setOperation(List operation) { - this.operation = operation; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListAllWorkByCenterId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListAllWorkByCenterId.java deleted file mode 100644 index 75e9df40ad..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListAllWorkByCenterId.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionListAllWorkByCenterId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListAllWorkByCenterId.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - List all_wrapWorkBaseInfoList = null; - List all_workBaseInfoList = null; - WoOkrCenterWorkInfo wrapOutOkrCenterWorkInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - Boolean check = true; - if( check ){ - try{ - okrCenterWorkInfo = okrCenterWorkInfoService.get( id );//查询中心工作信息是否存在 - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrCenterWorkInfo == null ){ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( id ); - result.error( exception ); - } - } - if( check ){ - try { - wrapOutOkrCenterWorkInfo = WoOkrCenterWorkInfo.copier.copy( okrCenterWorkInfo ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "将中心工作查询结果转换为可以输出的数据信息时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - //获取到该中心工作下所有的工作信息 - try { - all_workBaseInfoList = okrWorkBaseInfoService.listWorkInCenter( id, null ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据中心工作ID查询中心工作下所有具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( all_workBaseInfoList != null ){ - try { - all_wrapWorkBaseInfoList = WoOkrWorkBaseInfo.copier.copy( all_workBaseInfoList ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "将查询结果转换为可以输出的数据信息时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if( check ){ - if( all_wrapWorkBaseInfoList != null && !all_wrapWorkBaseInfoList.isEmpty() ){ - try { - SortTools.asc( all_wrapWorkBaseInfoList, "completeDateLimit" ); - } catch (Exception e) { - logger.warn( "system sort work list got an exception." ); - logger.error(e); - result.error( e ); - } - } - wrapOutOkrCenterWorkInfo.setWorks( all_wrapWorkBaseInfoList ); - result.setData( wrapOutOkrCenterWorkInfo ); - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListDeployWorkInCenterForForm.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListDeployWorkInCenterForForm.java deleted file mode 100644 index 8e465faed9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListDeployWorkInCenterForForm.java +++ /dev/null @@ -1,339 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionSystemWorkManagerCheck; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionListDeployWorkInCenterForForm extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListDeployWorkInCenterForForm.class ); - - @SuppressWarnings("unused") - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List wraps_all = null; - List result_wraps = new ArrayList<>(); - List okrWorkBaseInfoList = null; - List deployOkrWorkBaseInfoList = new ArrayList(); - - //存储装配中的信息 - Map resultWorkMap = new HashMap(); - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - WoOkrWorkBaseSimpleInfo wrapOutOkrWorkBaseInfo = null; - WoOkrWorkBaseSimpleInfo wrapOutParentWorkInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkDetailInfo detail = null; - Integer total = 0; - List ids = null; - List workOperation = null; - List workProcessIndentity = null; - Boolean viewAble = true;//是否允许查看工作详情 - Boolean editAble = false; //是否允许编辑工作信息 - Boolean splitAble = false; //是否允许拆解工作 - Boolean authorizeAble = false; //是否允许进行授权 - Boolean tackbackAble = false; //是否允许被收回 - Boolean deleteAble = false; //是否允许删除工作 - Boolean archiveAble = false; //是否允许归档工作 - Boolean isTopUnitWorkAdmin = false; //是否是顶层组织工作管理员 - - String work_dismantling = "CLOSE"; - String work_authorize = "CLOSE"; - String report_usercreate = "CLOSE"; - Set keySet = null; - Iterator iterator = null; - List query_statuses = new ArrayList(); - String loginIdentity = null; //当前用户登录身份名称 - Boolean check = true; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - work_dismantling = okrConfigSystemService.getValueWithConfigCode( "WORK_DISMANTLING" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_DISMANTLING" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - work_authorize = okrConfigSystemService.getValueWithConfigCode( "WORK_AUTHORIZE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_AUTHORIZE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - report_usercreate = okrConfigSystemService.getValueWithConfigCode( "REPORT_USERCREATE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "REPORT_USERCREATE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - isTopUnitWorkAdmin = true; - } - } catch (Exception e ) { - Exception exception = new ExceptionSystemWorkManagerCheck( e, okrUserCache.getLoginIdentityName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - okrCenterWorkInfo = okrCenterWorkInfoService.get( id ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的中心工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - loginIdentity = okrUserCache.getLoginIdentityName() ; - - //获取所有当前用户身份部署的工作信息 - okrWorkBaseInfoList = okrWorkBaseInfoService.listWorkInCenterByIdentity( loginIdentity, id, query_statuses ); - - //然后遍历所有的可查看的工作，将我部署的工作放在一起:deployOkrWorkBaseInfoList - if( okrWorkBaseInfoList != null ){ - for( OkrWorkBaseInfo okrWorkBaseInfo : okrWorkBaseInfoList ){ - if( okrWorkBaseInfo.getDeployerIdentity().equals( loginIdentity )){ - deployOkrWorkBaseInfoList.add( okrWorkBaseInfo ); - } - } - wraps_all = WoOkrWorkBaseSimpleInfo.copier.copy( okrWorkBaseInfoList ); - wraps = WoOkrWorkBaseSimpleInfo.copier.copy( deployOkrWorkBaseInfoList ); - total = deployOkrWorkBaseInfoList.size(); - } - - if( wraps != null ){ - //组织所有工作的上下级关系 - for( WoOkrWorkBaseSimpleInfo info : wraps ){ - workProcessIndentity = new ArrayList<>(); - workOperation = new ArrayList<>(); - viewAble = true;//是否允许查看工作详情 - editAble = false; //是否允许编辑工作信息 - splitAble = false; //是否允许拆解工作 - authorizeAble = false; //是否允许进行授权 - tackbackAble = false; //是否允许被收回 - archiveAble = false; //是否允许归档工作 - deleteAble = false; //是否允许删除工作 - - detail = okrWorkDetailInfoService.get( info.getId() ); - if( detail != null ){ - info.setWorkDetail( detail.getWorkDetail() ); - } - - if( info.getIsCompleted() || info.getOverallProgress() == 1 ) { - workProcessIndentity.add( "COMPLETED" ); - } - - //获取该工作中当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( info.getId(), okrUserCache.getLoginIdentityName(), null ); - if( okrWorkAuthorizeRecord != null ){ - //工作授权状态: NONE(未授权)|AUTHORING(授权中)|TACKBACK(已收回)|CANCEL(已失效) - if( "正常".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZE"); - //要判断一下,当前用户是授权人,还是承担人 - if( okrUserCache.getLoginIdentityName().equals( okrWorkAuthorizeRecord.getDelegatorIdentity() )){//授权人 - tackbackAble = true; - } - }else if( "已失效".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZECANCEL"); - }else if( "已收回".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("TACKBACK"); - } - } - - if( !"已归档".equals( info.getStatus() )){ - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - archiveAble = true; - } - } - - //判断工作处理职责身份: NONE(无权限)|VIEW(观察者)|READ(阅知者)|COOPERATE(协助者)|RESPONSIBILITY(责任者) - workProcessIndentity.add("VIEW");//能查出来肯定可见 - viewAble = true; - if ( okrWorkProcessIdentityService.isMyDeployWork( okrUserCache.getLoginIdentityName(), info.getId() )){ - workProcessIndentity.add("DEPLOY");//判断工作是否由我部署 - if( "草稿".equals( info.getWorkProcessStatus() )){ - editAble = true; //工作的部署者可以进行工作信息编辑， 草稿状态下可编辑，部署下去了就不能编辑了 - } - - try{ - //部署者在该工作没有部署下级工作（被下级拆解）的情况下,可以删除 - ids = okrWorkBaseInfoService.getSubNormalWorkBaseInfoIds( info.getId() ); - if( ids == null || ids.isEmpty() ){ - deleteAble = true; //部署者的工作 在 未被拆解和未被授权的情况下,可以被删除 - }else{ - info.setHasSubWorks( true ); - } - }catch( Exception e ){ - logger.warn( "system list sub work ids by workId got an exception." ); - logger.error(e); - } - } - if ( okrWorkProcessIdentityService.isMyReadWork( okrUserCache.getLoginIdentityName(), info.getId() )){ - workProcessIndentity.add("READ");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyCooperateWork( okrUserCache.getLoginIdentityName(), info.getId() )){ - workProcessIndentity.add("COOPERATE");//判断工作是否由我协助 - } - if ( okrWorkProcessIdentityService.isMyResponsibilityWork( okrUserCache.getLoginIdentityName(), info.getId() )){ - workProcessIndentity.add("RESPONSIBILITY");//判断工作是否由我负责 - //如果该工作未归档 ，正常执行中，那么责任者可以进行工作授权 - if( !"已归档".equalsIgnoreCase( info.getStatus() ) ){ - if( !info.getIsCompleted() ){ - //未完成的工作 - if( !tackbackAble ){ - authorizeAble = true; - } - splitAble = true; - } - } - } - - if( viewAble ){ - workOperation.add( "VIEW" ); - } - if( editAble ){ - workOperation.add( "EDIT" ); - } - if( splitAble ){ - if( "OPEN".equalsIgnoreCase( work_dismantling )){ - workOperation.add( "SPLIT" ); - } - } - if( authorizeAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "AUTHORIZE" ); - } - } - if( tackbackAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "TACKBACK" ); - } - } - if( archiveAble ){ - workOperation.add( "ARCHIVE" ); - } - if( deleteAble ){ - workOperation.add( "DELETE" ); - } - info.setWorkProcessIdentity( workProcessIndentity ); - info.setOperation( workOperation ); - - //------------------------------------------------------------------- - //查询工作的上级工作放到resultWorkMap里 - if( info != null && info.getParentWorkId() !=null && !info.getParentWorkId().isEmpty()){ - //先从resultWorkMap里查询上级工作对象 - wrapOutParentWorkInfo = resultWorkMap.get( info.getParentWorkId() ); - }else{ - //没有上级工作 - wrapOutParentWorkInfo = resultWorkMap.get( info.getCenterId() ); - } - if( wrapOutParentWorkInfo != null ){ - wrapOutParentWorkInfo.addNewSubWorkBaseInfo( info ); - }else{ - //map里没有上级工作信息，尝试从所有的工作里查询上级工作信息 - for( WoOkrWorkBaseSimpleInfo _info : wraps_all ){ - if( info.getParentWorkId() != null && info.getParentWorkId().equalsIgnoreCase( _info.getId() )){ - wrapOutParentWorkInfo = _info; - } - } - if( wrapOutParentWorkInfo != null ){ - //如果从所有工作中查询到上级工作信息,那么添加到Map里 - wrapOutParentWorkInfo.addNewSubWorkBaseInfo( info ); - resultWorkMap.put( wrapOutParentWorkInfo.getId(), wrapOutParentWorkInfo ); - } - } - if( wrapOutParentWorkInfo == null ){ - //如果仍没有找到上级工作,那么使用中心工作作为展现的上级工作 - if( okrCenterWorkInfo != null ){ - wrapOutParentWorkInfo = new WoOkrWorkBaseSimpleInfo(); - wrapOutParentWorkInfo.setWorkOrCenter( "CENTER" ); - wrapOutParentWorkInfo.setId( okrCenterWorkInfo.getId() ); - wrapOutParentWorkInfo.setTitle( okrCenterWorkInfo.getTitle() ); - wrapOutParentWorkInfo.setCenterId( okrCenterWorkInfo.getId() ); - wrapOutParentWorkInfo.setCenterTitle( okrCenterWorkInfo.getTitle() ); - wrapOutParentWorkInfo.setCompleteDateLimitStr( okrCenterWorkInfo.getDefaultCompleteDateLimitStr() ); - wrapOutParentWorkInfo.addNewSubWorkBaseInfo( info ); - resultWorkMap.put( info.getCenterId(), wrapOutParentWorkInfo ); - } - } - } - keySet = resultWorkMap.keySet(); - iterator = keySet.iterator(); - while( iterator.hasNext() ){ - wrapOutOkrWorkBaseInfo = resultWorkMap.get( iterator.next() ); - if( wrapOutOkrWorkBaseInfo != null ){ - SortTools.asc( wrapOutOkrWorkBaseInfo.getSubWorks(), "createTime" ); - result_wraps.add( wrapOutOkrWorkBaseInfo ); - } - } - } - if( result_wraps != null && !result_wraps.isEmpty() ){ - SortTools.asc( result_wraps, "createTime" ); - } - result.setCount( Long.valueOf( total + "" ) ); - result.setData( result_wraps ); - }catch(Exception e){ - logger.warn( "system filter okrWorkBaseInfo got an exception." ); - logger.error( e ); - result.error( e ); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityNextWithFilter.java deleted file mode 100644 index 9beae8fb51..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityNextWithFilter.java +++ /dev/null @@ -1,334 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionSystemWorkManagerCheck; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionListMyWorkByProcessIdentityNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyWorkByProcessIdentityNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrWorkBaseInfoList = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - OkrWorkDetailInfo detail = null; - List ids = null; - List workOperation = null; - List workProcessIndentity = null; - Boolean viewAble = true;//是否允许查看工作详情 - Boolean editAble = false; //是否允许编辑工作信息 - Boolean splitAble = false; //是否允许拆解工作 - Boolean authorizeAble = false; //是否允许进行授权 - Boolean tackbackAble = false; //是否允许被收回 - Boolean reportAble = false; //是否允许进行汇报 - Boolean deleteAble = false; //是否允许删除工作 - Boolean archiveAble = false; //是否允许归档工作 - Boolean appraiseAble = false; //是否允许启动工作考核 - Boolean progressAdjust = false; //是否允许调整工作进展 - Boolean isTopUnitWorkAdmin = false; //是否是顶层组织工作管理员 - - String work_dismantling = "CLOSE"; - String work_authorize = "CLOSE"; - String report_usercreate = "CLOSE"; - Integer appraise_max_times = 0; - - String APPRAISE_MAX_TIMES = "0"; - Long total = 0L; - Boolean check = true; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - work_dismantling = okrConfigSystemService.getValueWithConfigCode( "WORK_DISMANTLING" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_DISMANTLING" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - APPRAISE_MAX_TIMES = okrConfigSystemService.getValueWithConfigCode( "APPRAISE_MAX_TIMES" ); - //System.out.println("APPRAISE_MAX_TIMES=" + APPRAISE_MAX_TIMES); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "APPRAISE_MAX_TIMES" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - work_authorize = okrConfigSystemService.getValueWithConfigCode( "WORK_AUTHORIZE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_AUTHORIZE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - report_usercreate = okrConfigSystemService.getValueWithConfigCode( "REPORT_USERCREATE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "REPORT_USERCREATE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - appraise_max_times = Integer.parseInt( APPRAISE_MAX_TIMES ); - } catch (Exception e) { - e.printStackTrace(); - logger.warn("系统配置APPRAISE_MAX_TIMES不是合法数字。" ); - appraise_max_times = 0; - } - } - - if( check ){ - try { - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - isTopUnitWorkAdmin = true; - } - } catch (Exception e ) { - Exception exception = new ExceptionSystemWorkManagerCheck( e, okrUserCache.getLoginIdentityName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - //信息状态要是正常的，已删除的数据不需要查询出来 - wrapIn.addQueryEmployeeIdentities( okrUserCache.getLoginIdentityName() ); - - okrWorkBaseInfoList = okrWorkBaseInfoService.listWorkNextWithFilter( id, count, wrapIn ); - - //从数据库中查询符合条件的对象总数 - total = okrWorkBaseInfoService.getWorkCountWithFilter( wrapIn ); - wraps = WoOkrWorkBaseSimpleInfo.copier.copy( okrWorkBaseInfoList ); - - result.setCount( total ); - for( WoOkrWorkBaseSimpleInfo wrap : wraps ){ - workProcessIndentity = new ArrayList<>(); - workOperation = new ArrayList<>(); - appraiseAble = false; - viewAble = true;//是否允许查看工作详情 - editAble = false; //是否允许编辑工作信息 - splitAble = false; //是否允许拆解工作 - authorizeAble = false; //是否允许进行授权 - tackbackAble = false; //是否允许被收回 - reportAble = false; //是否允许进行汇报 - deleteAble = false; //是否允许删除工作 - - detail = okrWorkDetailInfoService.get( wrap.getId() ); - if( wrap.getAppraiseTimes() == null ) { - wrap.setAppraiseTimes(0); - } - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){ - //如果用户是管理,或者是部署者,可以对执行中的，不是草稿的工作进行工作进度调整 - if( !"草稿".equals( wrap.getWorkProcessStatus() ) && !"已归档".equals( wrap.getStatus() ) ){ - progressAdjust = true; - //如果未归档的工作，工作管理员可以启动考核 - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - if( !"审核中".equals( wrap.getCurrentAppraiseStatus() )) { - if( appraise_max_times > 0 && wrap.getAppraiseTimes() < appraise_max_times ) { - appraiseAble = true; - } -// else { -// System.out.println("考核次数已经达到最大值， appraise_max_times=" + appraise_max_times); -// } - } - } - } - } - - //判断工作是否已经完成 - if( wrap.getIsCompleted() || wrap.getOverallProgress() == 1 ) { - workProcessIndentity.add( "COMPLETED" );//工作已经完成 - } - - if( detail != null ){ - Integer maxCharCount = wrapIn.getMaxCharacterNumber(); - if( maxCharCount == null ){ - maxCharCount = 30; - } - if( maxCharCount != -1 && detail.getProgressAction() != null && detail.getProgressAction().length() > maxCharCount ){ - wrap.setProgressAction( detail.getProgressAction().substring(0, maxCharCount) + "..." ); - }else{ - wrap.setProgressAction( detail.getProgressAction() ); - } - if( maxCharCount != -1 && detail.getWorkDetail() != null && detail.getWorkDetail().length() > maxCharCount ){ - wrap.setWorkDetail( detail.getWorkDetail().substring(0, maxCharCount) + "..." ); - }else{ - wrap.setWorkDetail( detail.getWorkDetail() ); - } - } - - //获取该工作中当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( wrap.getId(), okrUserCache.getLoginIdentityName(), null ); - if( okrWorkAuthorizeRecord != null ){ - //工作授权状态: NONE(未授权)|AUTHORING(授权中)|TACKBACK(已收回)|CANCEL(已失效) - if( "正常".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZE"); - //要判断一下,当前用户是授权人,还是承担人 - if( okrUserCache.getLoginIdentityName().equals( okrWorkAuthorizeRecord.getDelegatorIdentity() )){//授权人 - tackbackAble = true; - } - }else if( "已失效".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZECANCEL"); - }else if( "已收回".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("TACKBACK"); - } - } - - //判断工作处理职责身份: NONE(无权限)|VIEW(观察者)|READ(阅知者)|COOPERATE(协助者)|RESPONSIBILITY(责任者) - workProcessIndentity.add("VIEW");//能查出来肯定可见 - viewAble = true; - if ( okrWorkProcessIdentityService.isMyDeployWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("DEPLOY");//判断工作是否由我部署 - if( "草稿".equals( wrap.getWorkProcessStatus() )){ - editAble = true; //工作的部署者可以进行工作信息编辑， 草稿状态下可编辑，部署下去了就不能编辑了 - }else{ - if( !"已归档".equals( wrap.getStatus() )){ - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - archiveAble = true; - } - } - } - try{ - //部署者在该工作没有部署下级工作（被下级拆解）的情况下,如果工作未被归档，可以删除 - ids = okrWorkBaseInfoService.getSubNormalWorkBaseInfoIds( wrap.getId() ); - if( ids == null || ids.isEmpty() ){ - if( !"已归档".equals( wrap.getStatus() )){ - deleteAble = true; //部署者的工作 在 未被拆解和未被授权的情况下,可以被删除 - }else { - if( !workProcessIndentity.contains("ARCHIVE")) { - workProcessIndentity.add("ARCHIVE");//工作已归档 - } - } - }else{ - wrap.setHasSubWorks( true ); - } - }catch( Exception e ){ - logger.warn( "system list sub work ids by workId got an exception."); - logger.error( e ); - } - } - if ( okrWorkProcessIdentityService.isMyReadWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("READ");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyCooperateWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("COOPERATE");//判断工作是否由我协助 - } - if ( okrWorkProcessIdentityService.isMyResponsibilityWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("RESPONSIBILITY");//判断工作是否由我负责 - //如果该工作未归档 ，正常执行中，那么责任者可以进行工作授权 - if( !"已归档".equalsIgnoreCase( wrap.getStatus() ) ){ - if( !wrap.getIsCompleted() ){ - //未完成的工作 - if( !tackbackAble ){ - authorizeAble = true; - } - reportAble = true; - splitAble = true; - } - }else { - if( !workProcessIndentity.contains("ARCHIVE")) { - workProcessIndentity.add("ARCHIVE");//工作已归档 - } - } - } - - if( viewAble ){ - workOperation.add( "VIEW" ); - } - if( editAble ){ - workOperation.add( "EDIT" ); - } - if( splitAble ){ - if( "OPEN".equalsIgnoreCase( work_dismantling )){ - workOperation.add( "SPLIT" ); - } - } - if( authorizeAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "AUTHORIZE" ); - } - } - if( tackbackAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "TACKBACK" ); - } - } - if( reportAble ){ - if( "OPEN".equalsIgnoreCase( report_usercreate )){ - workOperation.add( "REPORT" ); - } - } - if( archiveAble ){ - workOperation.add( "ARCHIVE" ); - } - if( progressAdjust ){ - workOperation.add( "PROGRESS" ); - } - if( deleteAble ){ - workOperation.add( "DELETE" ); - } - if( appraiseAble ){ - workOperation.add( "APPRAISE" ); - } - wrap.setWorkProcessIdentity( workProcessIndentity ); - wrap.setOperation( workOperation ); - } - result.setData( wraps ); - }catch(Exception e){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据条件进行数据列表查询时发生异常!" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityPrevWithFilter.java deleted file mode 100644 index 688ed62fa0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListMyWorkByProcessIdentityPrevWithFilter.java +++ /dev/null @@ -1,332 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionSystemWorkManagerCheck; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionListMyWorkByProcessIdentityPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyWorkByProcessIdentityPrevWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List okrWorkBaseInfoList = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - OkrWorkDetailInfo detail = null; - List ids = null; - List workOperation = null; - List workProcessIndentity = null; - Boolean viewAble = true;//是否允许查看工作详情 - Boolean editAble = false; //是否允许编辑工作信息 - Boolean splitAble = false; //是否允许拆解工作 - Boolean authorizeAble = false; //是否允许进行授权 - Boolean tackbackAble = false; //是否允许被收回 - Boolean reportAble = false; //是否允许进行汇报 - Boolean deleteAble = false; //是否允许删除工作 - Boolean archiveAble = false; //是否允许归档工作 - Boolean appraiseAble = false; //是否允许归档工作 - Boolean progressAdjust = false; //是否允许调整工作进展 - Boolean isTopUnitWorkAdmin = false; //是否是顶层组织工作管理员 - - String work_dismantling = "CLOSE"; - String work_authorize = "CLOSE"; - String report_usercreate = "CLOSE"; - Integer appraise_max_times = 0; - - String APPRAISE_MAX_TIMES = "0"; - Long total = 0L; - Boolean check = true; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - work_dismantling = okrConfigSystemService.getValueWithConfigCode( "WORK_DISMANTLING" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_DISMANTLING" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - APPRAISE_MAX_TIMES = okrConfigSystemService.getValueWithConfigCode( "APPRAISE_MAX_TIMES" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "APPRAISE_MAX_TIMES" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - work_authorize = okrConfigSystemService.getValueWithConfigCode( "WORK_AUTHORIZE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_AUTHORIZE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - report_usercreate = okrConfigSystemService.getValueWithConfigCode( "REPORT_USERCREATE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "REPORT_USERCREATE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - appraise_max_times = Integer.parseInt( APPRAISE_MAX_TIMES ); - } catch (Exception e) { - logger.warn("系统配置APPRAISE_MAX_TIMES不是合法数字。" ); - appraise_max_times = 0; - } - } - - if( check ){ - try { - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - isTopUnitWorkAdmin = true; - } - } catch (Exception e ) { - Exception exception = new ExceptionSystemWorkManagerCheck( e, okrUserCache.getLoginIdentityName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - //信息状态要是正常的，已删除的数据不需要查询出来 - wrapIn.addQueryEmployeeIdentities( okrUserCache.getLoginIdentityName() ); - - okrWorkBaseInfoList = okrWorkBaseInfoService.listWorkPrevWithFilter( id, count, wrapIn ); - //从数据库中查询符合条件的对象总数 - total = okrWorkBaseInfoService.getWorkCountWithFilter( wrapIn ); - wraps = WoOkrWorkBaseSimpleInfo.copier.copy( okrWorkBaseInfoList ); - result.setCount( total ); - - for( WoOkrWorkBaseSimpleInfo wrap : wraps ){ - workProcessIndentity = new ArrayList<>(); - workOperation = new ArrayList<>(); - viewAble = true;//是否允许查看工作详情 - editAble = false; //是否允许编辑工作信息 - splitAble = false; //是否允许拆解工作 - authorizeAble = false; //是否允许进行授权 - tackbackAble = false; //是否允许被收回 - reportAble = false; //是否允许进行汇报 - deleteAble = false; //是否允许删除工作 - - detail = okrWorkDetailInfoService.get( wrap.getId() ); - if( wrap.getAppraiseTimes() == null ) { - wrap.setAppraiseTimes(0); - } - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){ - //如果用户是管理,或者是部署者,可以对执行中的，不是草稿的工作进行工作进度调整 - if( !"草稿".equals( wrap.getWorkProcessStatus() ) && !"已归档".equals( wrap.getStatus() ) ){ - progressAdjust = true; - //如果未归档的工作，工作管理员可以启动考核 - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - if( !"审核中".equals( wrap.getCurrentAppraiseStatus() )) { - if( appraise_max_times > 0 && wrap.getAppraiseTimes() < appraise_max_times ) { - appraiseAble = true; - }else { - System.out.println("appraise_max_times=" + appraise_max_times); - System.out.println("wrap.getAppraiseTimes()=" + wrap.getAppraiseTimes() ); - } - }else { - System.out.println("工作审核中，不需要显示考核按钮。"); - } - } - } - } - - //判断工作是否已经完成 - if( wrap.getIsCompleted() || wrap.getOverallProgress() == 1 ) { - workProcessIndentity.add( "COMPLETED" );//工作已经完成 - } - - if( detail != null ){ - Integer maxCharCount = wrapIn.getMaxCharacterNumber(); - if( maxCharCount == null ){ - maxCharCount = 30; - } - if( maxCharCount != -1 && detail.getProgressAction() != null && detail.getProgressAction().length() > maxCharCount ){ - wrap.setProgressAction( detail.getProgressAction().substring(0, maxCharCount) + "..." ); - }else{ - wrap.setProgressAction( detail.getProgressAction() ); - } - if( maxCharCount != -1 && detail.getWorkDetail() != null && detail.getWorkDetail().length() > maxCharCount ){ - wrap.setWorkDetail( detail.getWorkDetail().substring(0, maxCharCount) + "..." ); - }else{ - wrap.setWorkDetail( detail.getWorkDetail() ); - } - } - - //获取该工作中当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( wrap.getId(), okrUserCache.getLoginIdentityName(), null ); - if( okrWorkAuthorizeRecord != null ){ - //工作授权状态: NONE(未授权)|AUTHORING(授权中)|TACKBACK(已收回)|CANCEL(已失效) - if( "正常".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZE"); - //要判断一下,当前用户是授权人,还是承担人 - if( okrUserCache.getLoginIdentityName().equals( okrWorkAuthorizeRecord.getDelegatorIdentity() )){//授权人 - tackbackAble = true; - } - }else if( "已失效".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZECANCEL"); - }else if( "已收回".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("TACKBACK"); - } - } - - //判断工作处理职责身份: NONE(无权限)|VIEW(观察者)|READ(阅知者)|COOPERATE(协助者)|RESPONSIBILITY(责任者) - workProcessIndentity.add("VIEW");//能查出来肯定可见 - viewAble = true; - if ( okrWorkProcessIdentityService.isMyDeployWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("DEPLOY");//判断工作是否由我部署 - if( "草稿".equals( wrap.getWorkProcessStatus() )){ - editAble = true; //工作的部署者可以进行工作信息编辑， 草稿状态下可编辑，部署下去了就不能编辑了 - }else{ - if( !"已归档".equals( wrap.getStatus() )){ - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - archiveAble = true; - } - }else { - if( !workProcessIndentity.contains("ARCHIVE")) { - workProcessIndentity.add("ARCHIVE");//工作已归档 - } - } - } - try{ - //部署者在该工作没有部署下级工作（被下级拆解）的情况下,可以删除 - ids = okrWorkBaseInfoService.getSubNormalWorkBaseInfoIds( wrap.getId() ); - if( ids == null || ids.isEmpty() ){ - deleteAble = true; //部署者的工作 在 未被拆解和未被授权的情况下,可以被删除 - }else{ - wrap.setHasSubWorks( true ); - } - }catch( Exception e ){ - logger.warn( "system list sub work ids by workId got an exception."); - logger.error( e ); - } - } - if ( okrWorkProcessIdentityService.isMyReadWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("READ");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyCooperateWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("COOPERATE");//判断工作是否由我协助 - } - if ( okrWorkProcessIdentityService.isMyResponsibilityWork( okrUserCache.getLoginIdentityName(), wrap.getId() )){ - workProcessIndentity.add("RESPONSIBILITY");//判断工作是否由我负责 - //如果该工作未归档 ，正常执行中，那么责任者可以进行工作授权 - if( !"已归档".equalsIgnoreCase( wrap.getStatus() ) ){ - if( !wrap.getIsCompleted() ){ - //未完成的工作 - if( !tackbackAble ){ - authorizeAble = true; - } - reportAble = true; - splitAble = true; - } - }else { - if( !workProcessIndentity.contains("ARCHIVE")) { - workProcessIndentity.add("ARCHIVE");//工作已归档 - } - } - } - - if( viewAble ){ - workOperation.add( "VIEW" ); - } - if( editAble ){ - workOperation.add( "EDIT" ); - } - if( splitAble ){ - if( "OPEN".equalsIgnoreCase( work_dismantling )){ - workOperation.add( "SPLIT" ); - } - } - if( authorizeAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "AUTHORIZE" ); - } - } - if( tackbackAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "TACKBACK" ); - } - } - if( reportAble ){ - if( "OPEN".equalsIgnoreCase( report_usercreate )){ - workOperation.add( "REPORT" ); - } - } - if( archiveAble ){ - workOperation.add( "ARCHIVE" ); - } - if( progressAdjust ){ - workOperation.add( "PROGRESS" ); - } - if( deleteAble ){ - workOperation.add( "DELETE" ); - } - if( appraiseAble ){ - workOperation.add( "APPRAISE" ); - } - wrap.setWorkProcessIdentity( workProcessIndentity ); - wrap.setOperation( workOperation ); - } - result.setData( wraps ); - }catch(Exception e){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据条件进行数据列表查询时发生异常!" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListNextWithFilter.java deleted file mode 100644 index 4e08743127..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListNextWithFilter.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; - -public class ActionListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, - String id, Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("title", wrapIn.getFilterLikeContent()); - likesMap.put("shortWorkDetail", wrapIn.getFilterLikeContent()); - likesMap.put("centerTitle", wrapIn.getFilterLikeContent()); - likesMap.put("creatorIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("workType", wrapIn.getFilterLikeContent()); - likesMap.put("responsibilityEmployeeName", wrapIn.getFilterLikeContent()); - likesMap.put("workProcessStatus", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(WoOkrWorkBaseInfo.copier, id, count, sequenceField, equalsMap, - notEqualsMap, likesMap, insMap, notInsMap, membersMap, notMembersMap, null, false, - wrapIn.getOrder()); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - private String filterLikeContent = null; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListPrevWithFilter.java deleted file mode 100644 index 5357edec0f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListPrevWithFilter.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; - -public class ActionListPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListPrevWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, - String id, Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("title", wrapIn.getFilterLikeContent()); - likesMap.put("shortWorkDetail", wrapIn.getFilterLikeContent()); - likesMap.put("centerTitle", wrapIn.getFilterLikeContent()); - likesMap.put("creatorIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("workType", wrapIn.getFilterLikeContent()); - likesMap.put("responsibilityEmployeeName", wrapIn.getFilterLikeContent()); - likesMap.put("workProcessStatus", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(WoOkrWorkBaseInfo.copier, id, count, sequenceField, equalsMap, - notEqualsMap, likesMap, insMap, notInsMap, membersMap, notMembersMap, null, false, - wrapIn.getOrder()); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - private String filterLikeContent = null; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String order = "DESC"; - - private Long rank = 0L; - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListProcessWorkInCenterForForm.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListProcessWorkInCenterForForm.java deleted file mode 100644 index da181de109..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListProcessWorkInCenterForForm.java +++ /dev/null @@ -1,275 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrcenterworkinfo.exception.ExceptionSystemWorkManagerCheck; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionListProcessWorkInCenterForForm extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListProcessWorkInCenterForForm.class ); - - - /** - * 列表：查看|拆解|授权 - * - * @param effectivePerson - * @param id - * @return - * @throws Exception - */ - @SuppressWarnings("unused") - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult<>(); - List result_wraps = new ArrayList<>(); - List okrWorkBaseInfoList = null; - WoOkrWorkBaseSimpleInfo wrapOutOkrWorkBaseInfo = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - OkrWorkDetailInfo detail = null; - Integer total = 0; - List ids = null; - List workOperation = null; - List workProcessIndentity = null; - Boolean viewAble = true;//是否允许查看工作详情 - Boolean editAble = false; //是否允许编辑工作信息 - Boolean splitAble = false; //是否允许拆解工作 - Boolean authorizeAble = false; //是否允许进行授权 - Boolean tackbackAble = false; //是否允许被收回 - Boolean deleteAble = false; //是否允许删除工作 - Boolean archiveAble = false; //是否允许归档工作 - Boolean isTopUnitWorkAdmin = false; //是否是顶层组织工作管理员 - - List query_statuses = new ArrayList(); - String loginIdentity = null; //当前用户登录身份名称 - String work_dismantling = "CLOSE"; - String work_authorize = "CLOSE"; - String report_usercreate = "CLOSE"; - Boolean check = true; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - work_dismantling = okrConfigSystemService.getValueWithConfigCode( "WORK_DISMANTLING" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_DISMANTLING" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - work_authorize = okrConfigSystemService.getValueWithConfigCode( "WORK_AUTHORIZE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "WORK_AUTHORIZE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - report_usercreate = okrConfigSystemService.getValueWithConfigCode( "REPORT_USERCREATE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定的Code查询系统配置时发生异常。Code:" + "REPORT_USERCREATE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - if( okrUserManagerService.isOkrWorkManager( okrUserCache.getLoginIdentityName() )){ - isTopUnitWorkAdmin = true; - } - } catch (Exception e ) { - Exception exception = new ExceptionSystemWorkManagerCheck( e, okrUserCache.getLoginIdentityName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try{ - loginIdentity = okrUserCache.getLoginIdentityName(); - - //获取所有当前用户身份在该中心工作中有关系的所有工作信息 - okrWorkBaseInfoList = okrWorkBaseInfoService.listWorkInCenterByIdentity( loginIdentity, id, query_statuses ); - - //然后遍历所有的可查看的工作，将上级部署给我，或者需要我参与的工作放在一起， 排除我部署的工作 - if( okrWorkBaseInfoList != null ){ - for( OkrWorkBaseInfo okrWorkBaseInfo : okrWorkBaseInfoList ){ - if( okrWorkBaseInfo.getDeployerIdentity() != null && !okrWorkBaseInfo.getDeployerIdentity().isEmpty() ){ - if( okrWorkBaseInfo.getDeployerIdentity().equals( loginIdentity ) || okrWorkBaseInfo.getDeployerIdentity().indexOf( loginIdentity ) >= 0){ - if( !okrWorkBaseInfo.getResponsibilityIdentity().equals( loginIdentity )){ - continue; //排除我部署给别人的的工作 - } - } - } - workProcessIndentity = new ArrayList<>(); - workOperation = new ArrayList<>(); - viewAble = true;//是否允许查看工作详情 - editAble = false; //是否允许编辑工作信息 - splitAble = false; //是否允许拆解工作 - authorizeAble = false; //是否允许进行授权 - tackbackAble = false; //是否允许被收回 - archiveAble = false; //是否允许归档工作 - deleteAble = false; //是否允许删除工作 - - wrapOutOkrWorkBaseInfo = WoOkrWorkBaseSimpleInfo.copier.copy( okrWorkBaseInfo ); - - detail = okrWorkDetailInfoService.get( wrapOutOkrWorkBaseInfo.getId() ); - if( detail != null ){ - wrapOutOkrWorkBaseInfo.setProgressAction( detail.getProgressAction() ); - wrapOutOkrWorkBaseInfo.setWorkDetail( detail.getWorkDetail() ); - } - - if( okrWorkBaseInfo.getIsCompleted() || okrWorkBaseInfo.getOverallProgress() == 1 ) { - workProcessIndentity.add( "COMPLETED" ); - } - - //获取该工作中当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( wrapOutOkrWorkBaseInfo.getId(), okrUserCache.getLoginIdentityName(), null ); - if( okrWorkAuthorizeRecord != null ){ - //工作授权状态: NONE(未授权)|AUTHORING(授权中)|TACKBACK(已收回)|CANCEL(已失效) - if( "正常".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZE"); - //要判断一下,当前用户是授权人,还是承担人 - if( okrUserCache.getLoginIdentityName().equals( okrWorkAuthorizeRecord.getDelegatorIdentity() )){//授权人 - tackbackAble = true; - } - }else if( "已失效".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("AUTHORIZECANCEL"); - }else if( "已收回".equals( okrWorkAuthorizeRecord.getStatus() ) ){ - workProcessIndentity.add("TACKBACK"); - } - } - - if( !"已归档".equals( okrWorkBaseInfo.getStatus() )){ - if( okrUserCache.isOkrManager() || isTopUnitWorkAdmin ){//如果用户是管理,或者是部署者 - archiveAble = true; - } - } - - //判断工作处理职责身份: NONE(无权限)|VIEW(观察者)|READ(阅知者)|COOPERATE(协助者)|RESPONSIBILITY(责任者) - workProcessIndentity.add("VIEW");//能查出来肯定可见 - viewAble = true; - if ( okrWorkProcessIdentityService.isMyDeployWork( okrUserCache.getLoginIdentityName(), wrapOutOkrWorkBaseInfo.getId() )){ - workProcessIndentity.add("DEPLOY");//判断工作是否由我部署 - if( "草稿".equals( wrapOutOkrWorkBaseInfo.getWorkProcessStatus() )){ - editAble = true; //工作的部署者可以进行工作信息编辑， 草稿状态下可编辑，部署下去了就不能编辑了 - } - - try{ - //部署者在该工作没有部署下级工作（被下级拆解）的情况下,可以删除 - ids = okrWorkBaseInfoService.getSubNormalWorkBaseInfoIds( wrapOutOkrWorkBaseInfo.getId() ); - if( ids == null || ids.isEmpty() ){ - deleteAble = true; //部署者的工作 在 未被拆解和未被授权的情况下,可以被删除 - }else{ - wrapOutOkrWorkBaseInfo.setHasSubWorks( true ); - } - }catch( Exception e ){ - logger.warn( "system list sub work ids by workId got an exception." ); - logger.error(e); - } - } - if ( okrWorkProcessIdentityService.isMyReadWork( okrUserCache.getLoginIdentityName(), wrapOutOkrWorkBaseInfo.getId() )){ - workProcessIndentity.add("READ");//判断工作是否由我阅知 - } - if ( okrWorkProcessIdentityService.isMyCooperateWork( okrUserCache.getLoginIdentityName(), wrapOutOkrWorkBaseInfo.getId() )){ - workProcessIndentity.add("COOPERATE");//判断工作是否由我协助 - } - if ( okrWorkProcessIdentityService.isMyResponsibilityWork( okrUserCache.getLoginIdentityName(), wrapOutOkrWorkBaseInfo.getId() )){ - workProcessIndentity.add("RESPONSIBILITY");//判断工作是否由我负责 - //如果该工作未归档 ，正常执行中，那么责任者可以进行工作授权 - if( !"已归档".equalsIgnoreCase( wrapOutOkrWorkBaseInfo.getStatus() ) ){ - if( !wrapOutOkrWorkBaseInfo.getIsCompleted() ){ - //未完成的工作 - if( !tackbackAble ){ - authorizeAble = true; - } - splitAble = true; - } - } - } - - if( viewAble ){ - workOperation.add( "VIEW" ); - } - if( editAble ){ - workOperation.add( "EDIT" ); - } - if( splitAble ){ - if( "OPEN".equalsIgnoreCase( work_dismantling )){ - workOperation.add( "SPLIT" ); - } - } - if( authorizeAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "AUTHORIZE" ); - } - } - if( tackbackAble ){ - if( "OPEN".equalsIgnoreCase( work_authorize )){ - workOperation.add( "TACKBACK" ); - } - } - if( archiveAble ){ - workOperation.add( "ARCHIVE" ); - } - if( deleteAble ){ - workOperation.add( "DELETE" ); - } - wrapOutOkrWorkBaseInfo.setWorkProcessIdentity( workProcessIndentity ); - wrapOutOkrWorkBaseInfo.setOperation( workOperation ); - result_wraps.add( wrapOutOkrWorkBaseInfo ); - } - total = result_wraps.size(); - } - if( result_wraps != null && !result_wraps.isEmpty() ){ - SortTools.asc( result_wraps, "completeDateLimitStr" ); - } - result.setCount( Long.valueOf( total + "" ) ); - result.setData( result_wraps ); - }catch(Exception e){ - logger.warn( "system filter okrWorkBaseInfo got an exception." ); - logger.error( e ); - result.error( e ); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListSubWork.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListSubWork.java deleted file mode 100644 index ab645b2cb5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListSubWork.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionListSubWork extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListSubWork.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult> result = new ActionResult<>(); - List wraps = null; - List ids = null; - List okrWorkBaseInfoList = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - boolean check = true; - - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if(check){ - try { - ids = okrWorkBaseInfoService.listByParentId( id ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据指定工作ID查询所有下级工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - if( ids != null && !ids.isEmpty()){ - try { - okrWorkBaseInfoList = okrWorkBaseInfoService.listByIds(ids); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据具体工作ID列表查询具体工作信息列表时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if(check){ - if( okrWorkBaseInfoList != null && !okrWorkBaseInfoList.isEmpty()){ - try { - wraps = WoOkrWorkBaseInfo.copier.copy(okrWorkBaseInfoList); - } catch (Exception e) { - Exception exception = new ExceptionWorkBaseInfoProcess( e, "将查询结果转换为可以输出的数据信息时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if(check){ - if( ListTools.isNotEmpty(wraps) ){ - for( WoOkrWorkBaseInfo wrapOutOkrWorkBaseInfo : wraps ){ - try { - okrWorkDetailInfo = okrWorkDetailInfoService.get( wrapOutOkrWorkBaseInfo.getId() ); - if( okrWorkDetailInfo != null ){ - wrapOutOkrWorkBaseInfo.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - wrapOutOkrWorkBaseInfo.setDutyDescription( okrWorkDetailInfo.getDutyDescription() ); - wrapOutOkrWorkBaseInfo.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrapOutOkrWorkBaseInfo.setMajorIssuesDescription( okrWorkDetailInfo.getMajorIssuesDescription() ); - wrapOutOkrWorkBaseInfo.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrapOutOkrWorkBaseInfo.setProgressPlan( okrWorkDetailInfo.getProgressPlan() ); - wrapOutOkrWorkBaseInfo.setResultDescription( okrWorkDetailInfo.getResultDescription() ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的工作详细信息时发生异常。ID：" + wrapOutOkrWorkBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - } - result.setData(wraps); - - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListUsersWorkByCenterId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListUsersWorkByCenterId.java deleted file mode 100644 index 3e102edf5a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionListUsersWorkByCenterId.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionListUsersWorkByCenterId extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListUsersWorkByCenterId.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - List wrapsWorkBaseInfoList_for_center = new ArrayList(); - List all_wrapWorkBaseInfoList = null; - List all_workBaseInfoList = null; - WoOkrCenterWorkInfo wrapOutOkrCenterWorkInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - List query_statuses = new ArrayList(); - Boolean hasNoneSubmitReport = false; - OkrUserCache okrUserCache = null; - Boolean check = true; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - try{ - query_statuses.add( "正常" ); - - //查询中心工作信息是否存在 - okrCenterWorkInfo = okrCenterWorkInfoService.get( id ); - if( okrCenterWorkInfo != null ){ - wrapOutOkrCenterWorkInfo = WoOkrCenterWorkInfo.copier.copy( okrCenterWorkInfo ); - //获取到该中心工作下所有的工作信息 - all_workBaseInfoList = okrWorkBaseInfoService.listWorkInCenter( id, query_statuses ); - if( all_workBaseInfoList != null ){ - all_wrapWorkBaseInfoList = WoOkrWorkBaseInfo.copier.copy( all_workBaseInfoList ); - if( all_wrapWorkBaseInfoList != null ){ - for( WoOkrWorkBaseInfo wrap_work : all_wrapWorkBaseInfoList){ - //判断工作是否有未提交的工作汇报 - hasNoneSubmitReport = false; - hasNoneSubmitReport = okrWorkBaseInfoService.hasNoneSubmitReport( - wrap_work.getId(), "草稿", "草稿", null - ); - wrap_work.setHasNoneSubmitReport( hasNoneSubmitReport ); - } - for( WoOkrWorkBaseInfo wrap_work : all_wrapWorkBaseInfoList){ - if( wrap_work.getParentWorkId() == null || wrap_work.getParentWorkId().isEmpty() ){ - wrap_work = composeSubWork( all_wrapWorkBaseInfoList, wrap_work ); - wrapsWorkBaseInfoList_for_center.add( wrap_work ); - } - } - } - } - }else{ - Exception exception = new ExceptionCenterWorkNotExists( id ); - result.error( exception ); - } - }catch( Exception e ){ - logger.warn( "system filter okrWorkBaseInfo got an exception." ); - logger.error(e); - result.error( e ); - } - if( wrapsWorkBaseInfoList_for_center != null && !wrapsWorkBaseInfoList_for_center.isEmpty() ){ - try { - SortTools.asc( wrapsWorkBaseInfoList_for_center, "completeDateLimit" ); - } catch (Exception e) { - logger.warn( "system sort work list got an exception." ); - logger.error(e); - result.error( e ); - } - } - if( wrapOutOkrCenterWorkInfo != null ){ - wrapOutOkrCenterWorkInfo.setWorks( wrapsWorkBaseInfoList_for_center ); - result.setData( wrapOutOkrCenterWorkInfo ); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionProgressAdjust.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionProgressAdjust.java deleted file mode 100644 index a5ffba8f5b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionProgressAdjust.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionProgressAdjust extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionProgressAdjust.class ); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String workId, Integer percent ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrUserCache okrUserCache = null; - Boolean check = true; - - if( workId == null || workId.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if(check){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( workId ); - result.error( exception ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - okrWorkBaseInfoOperationService.progressAdjust( workId, percent ); - result.setData( new Wo( workId ) ); - }catch(Exception e){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "工作进度调整操作过程中发生异常。ID:" + workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( okrWorkBaseInfo != null ){ - WrapInWorkDynamic.sendWithWorkInfo( okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "调整工作进展", - "工作进展调整成功！调整工作进展至["+percent+"%]" - ); - } - } - - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionRecycle.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionRecycle.java deleted file mode 100644 index aaab3c563a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionRecycle.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionRecycle extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionRecycle.class ); - private OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrUserCache okrUserCache = null; - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - try{ - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - okrWorkBaseInfoOperationService.recycleWork( id ); - }catch(Exception e){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "将指定ID的具体工作撤回时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( okrWorkBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkInfo( okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "撤回具体工作", - "具体工作撤回成功！" - ); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionSave.java deleted file mode 100644 index f0af2612b0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionSave.java +++ /dev/null @@ -1,397 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionCenterWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionReportCycleInvalid; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionReportDayInCycleEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionReportDayInCycleInvalid; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkCompleteDateLimitEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkCooperateInvalid; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkDetailEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkReadLeaderInvalid; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkResponsibilityEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkResponsibilityInvalid; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - private OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - String reportStartTime = "10:00:00"; - Date reportStartTime_date = null; - Date nextReportTime = null; - String reportTimeQue = null; - Boolean check = true; - WiOkrWorkBaseInfo wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, WiOkrWorkBaseInfo.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - //保存时wrapIn不能为空 - if( wrapIn != null ){ - wrapIn.setWorkProcessStatus( "草稿" ); - //这里需要去配置表里查询配置的汇报发起具体的时间点，REPORT_CREATETIME，如：10:00:00 - if( check ){ - try{ - reportStartTime = okrConfigSystemService.getValueWithConfigCode( "REPORT_CREATETIME" ); - if( reportStartTime == null || reportStartTime.isEmpty() ){ - reportStartTime = "10:00:00"; - } - }catch(Exception e){ - reportStartTime = "10:00:00"; - } - } - //检查配置的有效性 - if( check ){ - try{ - reportStartTime_date = dateOperation.getDateFromString( reportStartTime ); - reportStartTime = dateOperation.getDateStringFromDate( reportStartTime_date, "HH:mm:ss" ); - }catch(Exception e ){ - reportStartTime = "10:00:00"; - } - } - - //补充部署工作的年份和月份 - if( check ){ - wrapIn.setDeployYear( dateOperation.getYear( new Date() )); - wrapIn.setDeployMonth( dateOperation.getMonth( new Date() )); - wrapIn.setDeployDateStr( dateOperation.getNowDateTime() ); - } - - //创建人和部署人信息直接取当前操作人和登录人身份 - if( check ){ - wrapIn.setCreatorName( effectivePerson.getDistinguishedName() ); - if( effectivePerson.getDistinguishedName().equals( okrUserCache.getLoginUserName())){ - wrapIn.setCreatorUnitName( okrUserCache.getLoginUserUnitName()); - wrapIn.setCreatorTopUnitName( okrUserCache.getLoginUserTopUnitName()); - wrapIn.setCreatorIdentity( okrUserCache.getLoginIdentityName() ); - }else{ - try{//需要查询创建者的相关身份 - wrapIn.setCreatorIdentity( okrUserManagerService.getIdentityWithPerson( effectivePerson.getDistinguishedName() )); - wrapIn.setCreatorUnitName( okrUserManagerService.getUnitNameByIdentity( wrapIn.getCreatorIdentity() )); - wrapIn.setCreatorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( wrapIn.getCreatorIdentity() ) ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统通过操作用户查询用户身份和组织信息时发生异常!Person:" + effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if( check ){ - wrapIn.setDeployerName( okrUserCache.getLoginUserName() ); - wrapIn.setDeployerUnitName( okrUserCache.getLoginUserUnitName()); - wrapIn.setDeployerTopUnitName( okrUserCache.getLoginUserTopUnitName()); - wrapIn.setDeployerIdentity( okrUserCache.getLoginIdentityName() ); - } - - if( check ){ - if( wrapIn.getWorkDetail() == null || wrapIn.getWorkDetail().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkDetailEmpty(); - result.error( exception ); - }else{ - if( wrapIn.getWorkDetail().length() > 30 ){ - wrapIn.setTitle( wrapIn.getWorkDetail().substring( 0, 30 )+"..." ); - }else{ - wrapIn.setTitle( wrapIn.getWorkDetail() ); - } - } - } - - if( check ){ - if( wrapIn.getParentWorkId() != null && !wrapIn.getParentWorkId().isEmpty() ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getParentWorkId() ); - if( okrWorkBaseInfo != null ){ - //补充上级工作标题 - wrapIn.setParentWorkTitle( okrWorkBaseInfo.getTitle() ); - wrapIn.setCenterId( okrWorkBaseInfo.getCenterId() ); - }else{ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getParentWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + wrapIn.getParentWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - //补充中心工作标题 - if( check ){ - if( wrapIn.getCenterId() != null && !wrapIn.getCenterId().isEmpty() ){ - //根据ID查询中心工作信息 - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get( wrapIn.getCenterId() ); - if( okrCenterWorkInfo != null ){ - wrapIn.setCenterTitle( okrCenterWorkInfo.getTitle() ); - if( wrapIn.getWorkType() == null || wrapIn.getWorkType().isEmpty() ){ - wrapIn.setWorkType( okrCenterWorkInfo.getDefaultWorkType()); - } - if( wrapIn.getWorkLevel() == null || wrapIn.getWorkLevel().isEmpty() ){ - wrapIn.setWorkLevel( okrCenterWorkInfo.getDefaultWorkLevel()); - } - }else{ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( wrapIn.getCenterId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的中心工作信息时发生异常。ID：" + wrapIn.getCenterId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionCenterWorkIdEmpty(); - result.error( exception ); - } - } - - //校验工作完成时限数据，补充日期型完成时限数据 - if( check ){ - if( wrapIn.getCompleteDateLimitStr() != null && !wrapIn.getCompleteDateLimitStr().isEmpty() ) { - try{ - wrapIn.setCompleteDateLimit( dateOperation.getDateFromString( wrapIn.getCompleteDateLimitStr() ) ); - }catch( Exception e ){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "工作完成时限格式不正确，无法进行工作保存。Date：" + wrapIn.getCompleteDateLimitStr() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionWorkCompleteDateLimitEmpty(); - result.error( exception ); - } - } - - //校验责任者数据，需要补充组织者织信息 - if( check ){ - if( wrapIn.getResponsibilityIdentity() != null && !wrapIn.getResponsibilityIdentity().isEmpty() ){ - try { - wrapIn = composeResponsibilityInfoByIdentity( wrapIn ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkResponsibilityInvalid( e, wrapIn.getResponsibilityIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionWorkResponsibilityEmpty(); - result.error( exception ); - } - } - - //校验协助者数据，需要补充组织组织信息 - if( check ){ - try { - wrapIn = composeCooperateInfoByIdentity( wrapIn ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkCooperateInvalid( e, wrapIn.getCooperateIdentityList() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - //校验阅知者数据，需要补充组织组织信息 - if( check ){ - try { - wrapIn = composeReadLeaderByIdentity( wrapIn ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReadLeaderInvalid( e, wrapIn.getReadLeaderIdentityList() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - //校验汇报周期和汇报日期数据，并且补充汇报时间和时间序列 - if( wrapIn.getReportCycle() != null && wrapIn.getReportCycle().trim().equals( "不汇报" )){ - wrapIn.setIsNeedReport( false ); - wrapIn.setReportDayInCycle( null ); - wrapIn.setReportTimeQue( null ); - wrapIn.setLastReportTime( null ); - wrapIn.setNextReportTime( null ); - }else{ - if( wrapIn.getReportCycle() != null && wrapIn.getReportCycle().trim().equals( "每周汇报" )){ - if( wrapIn.getReportDayInCycle() != null ){ - wrapIn.setIsNeedReport( true ); - //检验每周汇报日的选择是否正确 - if( wrapIn.getReportDayInCycle() >= 1 && wrapIn.getReportDayInCycle() <= 7 ){ - //每周1-7 - try { - reportTimeQue = okrWorkBaseInfoService.getReportTimeQue( - dateOperation.getDateFromString(wrapIn.getDeployDateStr()), - wrapIn.getCompleteDateLimit(), - wrapIn.getReportCycle(), - wrapIn.getReportDayInCycle(), - reportStartTime - ); - } catch (Exception e) { - check = false; - logger.warn("系统根据汇报周期信息计算汇报时间序列时发生异常。DeployDate："+wrapIn.getDeployDateStr()+", CompleteDateLimit:"+wrapIn.getCompleteDateLimit()+", ReportCycle:"+wrapIn.getReportCycle()+", ReportDayInCycle:" + wrapIn.getReportDayInCycle() + ", ReportStartTime:" + reportStartTime); - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据汇报周期信息计算汇报时间序列时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - try { - nextReportTime = okrWorkBaseInfoService.getNextReportTime( reportTimeQue, wrapIn.getLastReportTime() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据汇报周期信息计算下一次汇报时间时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - wrapIn.setReportTimeQue( reportTimeQue ); - wrapIn.setNextReportTime( nextReportTime ); - }else{ - check = false; - Exception exception = new ExceptionReportDayInCycleInvalid( wrapIn.getReportDayInCycle() ); - result.error( exception ); - } - }else{ - check = false; - Exception exception = new ExceptionReportDayInCycleEmpty(); - result.error( exception ); - } - }else if( wrapIn.getReportCycle() != null && wrapIn.getReportCycle().trim().equals( "每月汇报" )){ - if( wrapIn.getReportDayInCycle() != null ){ - wrapIn.setIsNeedReport( true ); - if( wrapIn.getReportDayInCycle() >= 1 && wrapIn.getReportDayInCycle() <= 31 ){ - //每月1-31，如果选择的日期大于当月最大日期，那么默认定为当月最后一天 - try { - reportTimeQue = okrWorkBaseInfoService.getReportTimeQue( - dateOperation.getDateFromString( wrapIn.getDeployDateStr() ), - wrapIn.getCompleteDateLimit(), - wrapIn.getReportCycle(), - wrapIn.getReportDayInCycle(), - reportStartTime - ); - } catch (Exception e) { - check = false; - logger.warn("系统根据汇报周期信息计算汇报时间序列时发生异常。DeployDate："+wrapIn.getDeployDateStr()+", CompleteDateLimit:"+wrapIn.getCompleteDateLimit()+", ReportCycle:"+wrapIn.getReportCycle()+", ReportDayInCycle:" + wrapIn.getReportDayInCycle() + ", ReportStartTime:" + reportStartTime); - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据汇报周期信息计算汇报时间序列时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - try { - nextReportTime = okrWorkBaseInfoService.getNextReportTime( reportTimeQue, wrapIn.getLastReportTime() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据汇报周期信息计算下一次汇报时间时发生异常。" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - wrapIn.setReportTimeQue( reportTimeQue ); - wrapIn.setNextReportTime( nextReportTime ); - }else{ - check = false; - Exception exception = new ExceptionReportDayInCycleInvalid( wrapIn.getReportDayInCycle() ); - result.error( exception ); - } - }else{ - check = false; - Exception exception = new ExceptionReportDayInCycleEmpty(); - result.error( exception ); - } - }else{ - check = false; - Exception exception = new ExceptionReportCycleInvalid( wrapIn.getReportCycle() ); - result.error( exception ); - } - } - } - - if( check ){ - //创建新的工作信息，保存到数据库 - try{ - okrWorkBaseInfo = okrWorkBaseInfoOperationService.save( wrapIn, - wrapIn.getWorkDetail(), wrapIn.getDutyDescription(), wrapIn.getLandmarkDescription(), - wrapIn.getMajorIssuesDescription(), wrapIn.getProgressAction(), wrapIn.getProgressPlan(), - wrapIn.getResultDescription() ); - result.setData(new Wo( okrWorkBaseInfo.getId() )); - - if( okrWorkBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkInfo( okrWorkBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "保存具体工作", - "具体工作保存成功！" - ); - - //SmsMessageOperator.send(okrWorkBaseInfo.getResponsibilityEmployeeName(), "工作保存成功！"); - } - }catch( Exception e ){ - Exception exception = new ExceptionWorkBaseInfoProcess( e, "保存具体工作信息时发生异常! " ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionViewWork.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionViewWork.java deleted file mode 100644 index 706cd720a9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionViewWork.java +++ /dev/null @@ -1,1168 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkAppraiseInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionViewWork extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionViewWork.class ); - - /** - * 展示工作的详细信息 - * 1, 工作基础信息 - * 2, 工作详细信息内容 - * 3, 工作的附件列表 - * 4, 工作的部署过程(加上授权过程) - * 5, 工作的汇报基础信息列表 - * 6, 工作的问题请示基础信息列表 - * 7, 工作的交流信息列表 - * 8, 工作所在的中心工作信息内容 - * - * @param effectivePerson - * @param id - * @return - * @throws Exception - */ - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - List subWorkBaseInfoList = null; - List okrWorkReportBaseInfoList = null; - List attachmentList = null; - - Wo wrap = null; - WoOkrCenterWorkViewInfo wrapOutOkrCenterWorkViewInfo = null; - WoOkrWorkDeployAuthorizeRecord wrapOutOkrWorkDeployAuthorizeRecord = null; - WoOkrWorkDeployAuthorizeRecord _wrapOutOkrWorkDeployAuthorizeRecord = null; - List okrWorkAuthorizeRecordList = null; - List wrapOutSubWorkBaseInfoList = null; - List wrapOutOkrAttachmentFileInfos = null; - List wrapOutOkrWorkReportBaseSimpleInfoList = null; - List wrapOutOkrWorkDeployAuthorizeRecordList = new ArrayList<>(); - - List ids = null; - List subIds = null; - Date deployDate = null; - String dateTime = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - //1, 工作基础信息 - if(check){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( id ); - if( okrWorkBaseInfo != null ){ - if( okrWorkBaseInfo.getDeployDateStr() != null && !okrWorkBaseInfo.getDeployDateStr().isEmpty() ){ - deployDate = dateOperation.getDateFromString( okrWorkBaseInfo.getDeployDateStr() ); - } - wrap = Wo.copier.copy( okrWorkBaseInfo ); - }else{ - check = false; - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - //2, 工作所在的中心工作信息内容 - if (check) { - if ( okrWorkBaseInfo != null && okrWorkBaseInfo.getCenterId() != null ) { - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get( okrWorkBaseInfo.getCenterId() ); - if (okrCenterWorkInfo != null) { - wrapOutOkrCenterWorkViewInfo = WoOkrCenterWorkViewInfo.copier.copy( okrCenterWorkInfo ); - if ( wrapOutOkrCenterWorkViewInfo != null ) { - wrap.setCenterWorkInfo( wrapOutOkrCenterWorkViewInfo ); - } - }else{ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的中心工作信息时发生异常。ID：" + okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - //3, 工作详细信息内容 - if(check){ - try { - okrWorkDetailInfo = okrWorkDetailInfoService.get( id ); - if( okrWorkDetailInfo != null ){ - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - wrap.setDutyDescription( okrWorkDetailInfo.getDutyDescription() ); - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setMajorIssuesDescription( okrWorkDetailInfo.getMajorIssuesDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setProgressPlan( okrWorkDetailInfo.getProgressPlan() ); - wrap.setResultDescription( okrWorkDetailInfo.getResultDescription() ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的工作详细信息时发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - //4, 工作的附件列表 - if(check){ - if( okrWorkBaseInfo != null && okrWorkBaseInfo.getAttachmentList() != null && !okrWorkBaseInfo.getAttachmentList().isEmpty() ){ - try { - attachmentList = okrAttachmentFileInfoService.list( okrWorkBaseInfo.getAttachmentList() ); - if( attachmentList != null ){ - wrapOutOkrAttachmentFileInfos = WoOkrAttachmentFileInfo.copier.copy( attachmentList ); - wrap.setWorkAttachments(wrapOutOkrAttachmentFileInfos); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "根据工作ID获取工作附件列表发生异常，ID:"+id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - } - //5, 工作的汇报基础信息列表 - if (check) { - try { - ids = okrWorkReportQueryService.listByWorkId( id ); - if (ids != null && !ids.isEmpty()) { - okrWorkReportBaseInfoList = okrWorkReportQueryService.listByIds(ids); - if (okrWorkReportBaseInfoList != null && !okrWorkReportBaseInfoList.isEmpty()) { - wrapOutOkrWorkReportBaseSimpleInfoList = WoOkrWorkReportBaseSimpleInfo.copier.copy( okrWorkReportBaseInfoList ); - wrap.setWorkReports(wrapOutOkrWorkReportBaseSimpleInfoList); - } - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID查询所有工作汇报ID列表发生异常. ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - //6, 当前用户最后一次对该工作的授权信息,如果有的话 - if(check){ - try { - //获取该工作和当前责任人相关的授权信息 - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getLastAuthorizeRecord( id, okrUserCache.getLoginIdentityName(), "正常" ); - if( okrWorkAuthorizeRecord != null ){ - wrap.setOkrWorkAuthorizeRecord( WoOkrWorkAuthorizeRecord.copier.copy( okrWorkAuthorizeRecord ) ); - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID以及授权相关人信息查询工作最后一次授权信息发生异常。Person: "+ okrUserCache.getLoginIdentityName() +", ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - //7, 递归查询所有的下级工作信息 - if(check){ - subIds = okrWorkBaseInfoService.listByParentId( id ); - if( subIds != null && !subIds.isEmpty() ){ - subWorkBaseInfoList = okrWorkBaseInfoService.listByIds( subIds ); - if( subWorkBaseInfoList != null && !subWorkBaseInfoList.isEmpty() ){ - wrapOutSubWorkBaseInfoList = WoOkrWorkBaseSimpleInfo.copier.copy( subWorkBaseInfoList ); - wrap.setSubWorks( wrapOutSubWorkBaseInfoList ); - } - } - } - - //6, 工作的问题请示基础信息列表 - //7, 工作的交流信息列表(另外的请求取, 不做) - if(check){ - try { - //获取该工作所有的授权信息 - ids = okrWorkAuthorizeRecordService.listByWorkId( id ); - if( ids != null && !ids.isEmpty() ){ - okrWorkAuthorizeRecordList = okrWorkAuthorizeRecordService.list( ids ); - if( okrWorkAuthorizeRecordList != null ){ - for( OkrWorkAuthorizeRecord _okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - if( deployDate.before( _okrWorkAuthorizeRecord.getDelegateDateTime() )){ - deployDate = _okrWorkAuthorizeRecord.getDelegateDateTime(); - } - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getWorkId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作授权" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "AUTHORIZE" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( _okrWorkAuthorizeRecord.getDelegateDateTimeStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( _okrWorkAuthorizeRecord.getTargetIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( _okrWorkAuthorizeRecord.getDelegateOpinion() ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - if( _okrWorkAuthorizeRecord.getTakebackDateTime() != null && "已收回".equals( _okrWorkAuthorizeRecord.getStatus() )){ - if( deployDate.before( _okrWorkAuthorizeRecord.getTakebackDateTime() )){ - deployDate = _okrWorkAuthorizeRecord.getTakebackDateTime(); - } - try{ - dateTime = dateOperation.getDate( _okrWorkAuthorizeRecord.getTakebackDateTime(), "yyyy-MM-dd HH:mm:ss"); - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getWorkId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "授权收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "TACKBACK" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( dateTime ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - }catch( Exception e ){ - logger.warn( "授权收回时间格式化异常, tackbacktime:" + _okrWorkAuthorizeRecord.getTakebackDateTime() ); - logger.error( e ); - } - } - } - } - } - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "系统根据工作ID以及授权相关人信息查询工作最后一次授权信息发生异常。ID：" + id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if(check){ - //获取到第一次授权, 要增加部署者到第一次授权者的部署过程,如果没有授权, 那么就是部署者到负责者的部署过程 - if( wrapOutOkrWorkDeployAuthorizeRecordList != null && !wrapOutOkrWorkDeployAuthorizeRecordList.isEmpty() ){ - SortTools.asc( wrapOutOkrWorkDeployAuthorizeRecordList, "operationTime" ); - _wrapOutOkrWorkDeployAuthorizeRecord = wrapOutOkrWorkDeployAuthorizeRecordList.get( 0 ); - if( _wrapOutOkrWorkDeployAuthorizeRecord != null ){ - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( okrWorkBaseInfo.getId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( okrWorkBaseInfo.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( okrWorkBaseInfo.getDeployerIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作部署" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "DEPLOY" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( okrWorkBaseInfo.getDeployDateStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( _wrapOutOkrWorkDeployAuthorizeRecord.getSource() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于工作信息和第一条授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - } - }else{ - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( okrWorkBaseInfo.getId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( okrWorkBaseInfo.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( okrWorkBaseInfo.getDeployerIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作部署" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "DEPLOY" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( okrWorkBaseInfo.getDeployDateStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( okrWorkBaseInfo.getResponsibilityEmployeeName() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于工作信息" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - } - } - - if(check){ - //递归查询上级工作的部署者,组织部署记录 - while( okrWorkBaseInfo != null && okrWorkBaseInfo.getParentWorkId() != null && !okrWorkBaseInfo.getParentWorkId().isEmpty() - && !okrWorkBaseInfo.getParentWorkId().equals( okrWorkBaseInfo.getId() ) - ){ - try { - String responsibilityIdentity = okrWorkBaseInfo.getDeployerIdentity(); - okrWorkBaseInfo = okrWorkBaseInfoService.get( okrWorkBaseInfo.getParentWorkId() ); - if( okrWorkBaseInfo != null ){ - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( okrWorkBaseInfo.getId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( okrWorkBaseInfo.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( okrWorkBaseInfo.getDeployerIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作部署" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "DEPLOY" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( okrWorkBaseInfo.getDeployDateStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( responsibilityIdentity ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于上级工作信息" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - - //获取该工作所有的授权信息 - ids = okrWorkAuthorizeRecordService.listByWorkId( okrWorkBaseInfo.getId() ); - if( ids != null && !ids.isEmpty() ){ - okrWorkAuthorizeRecordList = okrWorkAuthorizeRecordService.list( ids ); - - if( okrWorkAuthorizeRecordList != null ){ - for( OkrWorkAuthorizeRecord _okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - if( deployDate != null && _okrWorkAuthorizeRecord.getDelegateDateTime().before( deployDate )){ - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "工作授权" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "AUTHORIZE" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( _okrWorkAuthorizeRecord.getDelegateDateTimeStr() ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( _okrWorkAuthorizeRecord.getTargetIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( _okrWorkAuthorizeRecord.getDelegateOpinion() ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于上级授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - - if( _okrWorkAuthorizeRecord.getTakebackDateTime() != null && "已收回".equals( _okrWorkAuthorizeRecord.getStatus() )){ - if( deployDate != null && _okrWorkAuthorizeRecord.getTakebackDateTime().before( deployDate )){ - try{ - dateTime = dateOperation.getDate( _okrWorkAuthorizeRecord.getTakebackDateTime(), "yyyy-MM-dd HH:mm:ss"); - wrapOutOkrWorkDeployAuthorizeRecord = new WoOkrWorkDeployAuthorizeRecord(); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkId( _okrWorkAuthorizeRecord.getId() ); - wrapOutOkrWorkDeployAuthorizeRecord.setWorkTitle( _okrWorkAuthorizeRecord.getTitle()); - wrapOutOkrWorkDeployAuthorizeRecord.setSource( _okrWorkAuthorizeRecord.getDelegatorIdentity() ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTypeCN( "授权收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationType( "TACKBACK" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOperationTime( dateTime ); - wrapOutOkrWorkDeployAuthorizeRecord.setTarget( "" ); - wrapOutOkrWorkDeployAuthorizeRecord.setOpinion( "收回" ); - wrapOutOkrWorkDeployAuthorizeRecord.setDescription( "信息来自于上级授权记录" ); - wrapOutOkrWorkDeployAuthorizeRecordList.add( wrapOutOkrWorkDeployAuthorizeRecord ); - }catch( Exception e ){ - logger.warn( "授权收回时间格式化异常, tackbacktime:" + _okrWorkAuthorizeRecord.getTakebackDateTime() ); - logger.error( e ); - } - } - } - } - } - } - } - } - } catch ( Exception e ) { - check = false; - result.error( e ); - logger.warn( "system get work info by work id got an exception. id:"+okrWorkBaseInfo.getParentWorkId() ); - logger.error( e ); - } - } - } - if( ListTools.isNotEmpty(wrapOutOkrWorkDeployAuthorizeRecordList)) { - SortTools.asc( wrapOutOkrWorkDeployAuthorizeRecordList, "operationTime" ); - } - - //如果有考核信息，将考核信息全部放进考核信息对象列表里 - if(check){ - List appraiseInfoList = null; - List woAppraiseInfoList = null; - if( ListTools.isNotEmpty( wrap.getAppraiseInfoList() )) { - appraiseInfoList = okrWorkAppraiseQueryService.listByIds( wrap.getAppraiseInfoList() ); - if(ListTools.isNotEmpty( appraiseInfoList )) { - woAppraiseInfoList = WoOkrWorkAppraiseInfo.copier.copy(appraiseInfoList); - SortTools.asc( woAppraiseInfoList, "createTime" ); - wrap.setAppraiseObjectList(woAppraiseInfoList); - } - } - } - - if( wrap != null ){ - wrap.setWorkDeployAuthorizeRecords( wrapOutOkrWorkDeployAuthorizeRecordList ); - result.setData(wrap); - } - return result; - } - - public static class WoOkrWorkAppraiseInfo extends OkrWorkAppraiseInfo { - private static final long serialVersionUID = 1L; - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkAppraiseInfo.class, WoOkrWorkAppraiseInfo.class, null, JpaObject.FieldsInvisible); - } - - public static class Wo { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkBaseInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe( "工作所属中心工作信息" ) - private WoOkrCenterWorkViewInfo centerWorkInfo = null; - - @FieldDescribe( "工作附件信息列表" ) - private List< WoOkrAttachmentFileInfo > workAttachments = null; - - @FieldDescribe( "子工作信息列表" ) - private List< WoOkrWorkBaseSimpleInfo > subWorks = null; - - @FieldDescribe( "工作汇报信息简单信息列表" ) - private List< WoOkrWorkReportBaseSimpleInfo > workReports = null; - - @FieldDescribe( "工作组织以及授权过程列表， 由该工作的上级工作线以及工作授权记录一起组织起来的信息列表" ) - private List< WoOkrWorkDeployAuthorizeRecord > workDeployAuthorizeRecords = null; - - @FieldDescribe( "查看者的授权信息, 有可能没有" ) - private WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - - @FieldDescribe( "工作ID" ) - private String id = ""; - - @FieldDescribe( "工作标题" ) - private String title = ""; - - @FieldDescribe( "中心工作ID" ) - private String centerId = ""; - - @FieldDescribe( "中心工作标题" ) - private String centerTitle = ""; - - @FieldDescribe( "上级工作ID" ) - private String parentWorkId = ""; - - @FieldDescribe( "上级工作标题" ) - private String parentWorkTitle = ""; - - @FieldDescribe( "工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报）" ) - private String workDateTimeType = "长期工作"; - - @FieldDescribe( "部署者姓名" ) - private String deployerName = ""; - - @FieldDescribe( "部署者身份" ) - private String deployerIdentity = ""; - - @FieldDescribe( "部署者所属组织" ) - private String deployerUnitName = ""; - - @FieldDescribe( "部署者所属顶层组织" ) - private String deployerTopUnitName = ""; - - @FieldDescribe( "工作部署日期-字符串，显示用：yyyy-mm-dd" ) - private String deployDateStr = ""; - - @FieldDescribe( "工作确认日期-字符串，显示用：yyyy-mm-dd" ) - private String confirmDateStr = ""; - - @FieldDescribe( "工作完成日期-字符串，显示用：yyyy-mm-dd" ) - private String completeDateLimitStr = ""; - - @FieldDescribe( "主责人姓名" ) - private String responsibilityEmployeeName = ""; - - @FieldDescribe( "主责人身份" ) - private String responsibilityIdentity = ""; - - @FieldDescribe( "主责人所属组织" ) - private String responsibilityUnitName = ""; - - @FieldDescribe( "主责人所属顶层组织" ) - private String responsibilityTopUnitName = ""; - - @FieldDescribe( "协助人姓名，多值" ) - private List cooperateEmployeeNameList = null; - - @FieldDescribe( "协助人身份，多值" ) - private List cooperateIdentityList = null; - - @FieldDescribe( "协助人所属组织，多值" ) - private List cooperateUnitNameList = null; - - @FieldDescribe( "协助人所属顶层组织，多值" ) - private List cooperateTopUnitNameList = null; - - @FieldDescribe( "阅知领导身份，多值" ) - private List readLeaderIdentityList = null; - - @FieldDescribe( "阅知领导，可能多值" ) - private List readLeaderNameList = null; - - @FieldDescribe( "阅知领导所属组织，多值" ) - private List readLeaderUnitNameList = null; - - @FieldDescribe( "阅知领导所属顶层组织，多值" ) - private List readLeaderTopUnitNameList = null; - - @FieldDescribe( "工作类别" ) - private String workType = ""; - - @FieldDescribe( "工作级别" ) - private String workLevel = ""; - - @FieldDescribe( "工作进度" ) - private Double overallProgress = 0.0; - - @FieldDescribe( "工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消" ) - private String workProcessStatus = "草稿"; - - @FieldDescribe( "工作是否已超期" ) - private Boolean isOverTime = false; - - @FieldDescribe( "工作是否已完成" ) - private Boolean isCompleted = false; - - @FieldDescribe( "上一次汇报时间" ) - private Date lastReportTime = null; - - @FieldDescribe( "下一次汇报时间" ) - private Date nextReportTime = null; - - @FieldDescribe( "已汇报次数" ) - private Integer reportCount = 0; - - @FieldDescribe( "汇报周期:不需要汇报|每月汇报|每周汇报" ) - private String reportCycle = ""; - - @FieldDescribe( "是否需要定期汇报" ) - private Boolean isNeedReport = true; - - @FieldDescribe( "周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00" ) - private Integer reportDayInCycle = 0; - - @FieldDescribe( "工作汇报是否需要管理补充信息" ) - private Boolean reportNeedAdminAudit = false; - - @FieldDescribe( "工作管理员姓名" ) - private String reportAdminName = ""; - - @FieldDescribe( "工作管理员姓名" ) - private String reportAdminIdentity = ""; - - @FieldDescribe( "工作详细描述, 事项分解" ) - private String workDetail = ""; - - @FieldDescribe( "职责描述" ) - private String dutyDescription = ""; - - @FieldDescribe( "里程碑标志说明" ) - private String landmarkDescription = ""; - - @FieldDescribe( "重点事项说明" ) - private String majorIssuesDescription = ""; - - @FieldDescribe( "具体行动举措" ) - private String progressAction = ""; - - @FieldDescribe( "进展计划时限说明" ) - private String progressPlan = ""; - - @FieldDescribe( "交付成果说明" ) - private String resultDescription = ""; - - @FieldDescribe( "信息状态：正常|已归档" ) - private String status = ""; - - @FieldDescribe( "归档日期" ) - private Date archiveDate = null; - - @FieldDescribe( "完成日期日期" ) - private Date completeTime = null; - - @FieldDescribe( "当前考核信息标题" ) - private String currentAppraiseTitle = "无标题"; - - @FieldDescribe( "当前考核信息Id" ) - private String currentAppraiseInfoId = ""; - - @FieldDescribe( "当前考核流程WorkID" ) - private String currentAppraiseWorkId = ""; - - @FieldDescribe( "当前考核流程JobID" ) - private String currentAppraiseJobId = ""; - - @FieldDescribe( "当前考核流程环节名称" ) - private String currentActivityName = ""; - - @FieldDescribe( "当前考核审核状态" ) - private String currentAppraiseStatus = ""; - - @FieldDescribe( "考核次数" ) - private Integer appraiseTimes = 0; - - @FieldDescribe("考核流程信息ID列表") - private List appraiseInfoList; - - @FieldDescribe("考核流程信息列表") - private List appraiseObjectList; - - private Long rank = 0L; - - public List getAppraiseObjectList() { - return appraiseObjectList; - } - - public void setAppraiseObjectList(List appraiseObjectList) { - this.appraiseObjectList = appraiseObjectList; - } - public String getCurrentAppraiseWorkId() { - return currentAppraiseWorkId; - } - - public String getCurrentActivityName() { - return currentActivityName; - } - - public String getCurrentAppraiseStatus() { - return currentAppraiseStatus; - } - - public Integer getAppraiseTimes() { - return appraiseTimes; - } - - public String getCurrentAppraiseJobId() { - return currentAppraiseJobId; - } - - public void setCurrentAppraiseJobId(String currentAppraiseJobId) { - this.currentAppraiseJobId = currentAppraiseJobId; - } - - public List getAppraiseInfoList() { - return appraiseInfoList; - } - public void setCurrentAppraiseWorkId(String currentAppraiseWorkId) { - this.currentAppraiseWorkId = currentAppraiseWorkId; - } - - public void setCurrentActivityName(String currentActivityName) { - this.currentActivityName = currentActivityName; - } - - public void setCurrentAppraiseStatus(String currentAppraiseStatus) { - this.currentAppraiseStatus = currentAppraiseStatus; - } - - public void setAppraiseTimes(Integer appraiseTimes) { - this.appraiseTimes = appraiseTimes; - } - - public void setAppraiseInfoList(List appraiseInfoList) { - this.appraiseInfoList = appraiseInfoList; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public WoOkrWorkAuthorizeRecord getOkrWorkAuthorizeRecord() { - return okrWorkAuthorizeRecord; - } - - public void setOkrWorkAuthorizeRecord(WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord) { - this.okrWorkAuthorizeRecord = okrWorkAuthorizeRecord; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCenterId() { - return centerId; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public String getParentWorkId() { - return parentWorkId; - } - - public void setParentWorkId( String parentWorkId ) { - this.parentWorkId = parentWorkId; - } - - public String getParentWorkTitle() { - return parentWorkTitle; - } - - public void setParentWorkTitle(String parentWorkTitle) { - this.parentWorkTitle = parentWorkTitle; - } - - public String getWorkDateTimeType() { - return workDateTimeType; - } - - public void setWorkDateTimeType(String workDateTimeType) { - this.workDateTimeType = workDateTimeType; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getDeployDateStr() { - return deployDateStr; - } - - public void setDeployDateStr(String deployDateStr) { - this.deployDateStr = deployDateStr; - } - - public String getConfirmDateStr() { - return confirmDateStr; - } - - public void setConfirmDateStr(String confirmDateStr) { - this.confirmDateStr = confirmDateStr; - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public Double getOverallProgress() { - return overallProgress; - } - - public void setOverallProgress(Double overallProgress) { - this.overallProgress = overallProgress; - } - - public String getWorkProcessStatus() { - return workProcessStatus; - } - - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - public Boolean getIsOverTime() { - return isOverTime; - } - - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - public Boolean getIsCompleted() { - return isCompleted; - } - - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - public Date getLastReportTime() { - return lastReportTime; - } - - public void setLastReportTime(Date lastReportTime) { - this.lastReportTime = lastReportTime; - } - - public Date getNextReportTime() { - return nextReportTime; - } - - public void setNextReportTime(Date nextReportTime) { - this.nextReportTime = nextReportTime; - } - - public Integer getReportCount() { - return reportCount; - } - - public void setReportCount(Integer reportCount) { - this.reportCount = reportCount; - } - - public String getReportCycle() { - return reportCycle; - } - - public void setReportCycle(String reportCycle) { - this.reportCycle = reportCycle; - } - - public Boolean getIsNeedReport() { - return isNeedReport; - } - - public void setIsNeedReport(Boolean isNeedReport) { - this.isNeedReport = isNeedReport; - } - - public Integer getReportDayInCycle() { - return reportDayInCycle; - } - - public void setReportDayInCycle(Integer reportDayInCycle) { - this.reportDayInCycle = reportDayInCycle; - } - - public Boolean getReportNeedAdminAudit() { - return reportNeedAdminAudit; - } - - public void setReportNeedAdminAudit(Boolean reportNeedAdminAudit) { - this.reportNeedAdminAudit = reportNeedAdminAudit; - } - - public String getReportAdminName() { - return reportAdminName; - } - - public void setReportAdminName(String reportAdminName) { - this.reportAdminName = reportAdminName; - } - - public String getReportAdminIdentity() { - return reportAdminIdentity; - } - - public void setReportAdminIdentity(String reportAdminIdentity) { - this.reportAdminIdentity = reportAdminIdentity; - } - - public WoOkrCenterWorkViewInfo getCenterWorkInfo() { - return centerWorkInfo; - } - - public void setCenterWorkInfo(WoOkrCenterWorkViewInfo centerWorkInfo) { - this.centerWorkInfo = centerWorkInfo; - } - - public List getWorkAttachments() { - return workAttachments; - } - - public void setWorkAttachments(List workAttachments) { - this.workAttachments = workAttachments; - } - - public List getWorkReports() { - return workReports; - } - - public void setWorkReports(List workReports) { - this.workReports = workReports; - } - - public List getWorkDeployAuthorizeRecords() { - return workDeployAuthorizeRecords; - } - - public void setWorkDeployAuthorizeRecords(List workDeployAuthorizeRecords) { - this.workDeployAuthorizeRecords = workDeployAuthorizeRecords; - } - - public List getSubWorks() { - return subWorks; - } - - public void setSubWorks(List subWorks) { - this.subWorks = subWorks; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Date getArchiveDate() { - return archiveDate; - } - - public Date getCompleteTime() { - return completeTime; - } - - public void setArchiveDate(Date archiveDate) { - this.archiveDate = archiveDate; - } - - public void setCompleteTime(Date completeTime) { - this.completeTime = completeTime; - } - - public String getCurrentAppraiseTitle() { - return currentAppraiseTitle; - } - - public String getCurrentAppraiseInfoId() { - return currentAppraiseInfoId; - } - - public void setCurrentAppraiseTitle(String currentAppraiseTitle) { - this.currentAppraiseTitle = currentAppraiseTitle; - } - - public void setCurrentAppraiseInfoId(String currentAppraiseInfoId) { - this.currentAppraiseInfoId = currentAppraiseInfoId; - } - - public List getCooperateEmployeeNameList() { - return cooperateEmployeeNameList == null?new ArrayList<>(): cooperateEmployeeNameList; - } - - public List getCooperateIdentityList() { - return cooperateIdentityList == null?new ArrayList<>(): cooperateIdentityList; - } - - public List getCooperateUnitNameList() { - return cooperateUnitNameList == null?new ArrayList<>(): cooperateUnitNameList; - } - - public List getCooperateTopUnitNameList() { - return cooperateTopUnitNameList == null?new ArrayList<>(): cooperateTopUnitNameList; - } - - public List getReadLeaderIdentityList() { - return readLeaderIdentityList == null?new ArrayList<>(): readLeaderIdentityList; - } - - public List getReadLeaderNameList() { - return readLeaderNameList == null?new ArrayList<>(): readLeaderNameList; - } - - public List getReadLeaderUnitNameList() { - return readLeaderUnitNameList == null?new ArrayList<>(): readLeaderUnitNameList; - } - - public List getReadLeaderTopUnitNameList() { - return readLeaderTopUnitNameList == null?new ArrayList<>(): readLeaderTopUnitNameList; - } - - public void setCooperateEmployeeNameList(List cooperateEmployeeNameList) { - this.cooperateEmployeeNameList = cooperateEmployeeNameList; - } - - public void setCooperateIdentityList(List cooperateIdentityList) { - this.cooperateIdentityList = cooperateIdentityList; - } - - public void setCooperateUnitNameList(List cooperateUnitNameList) { - this.cooperateUnitNameList = cooperateUnitNameList; - } - - public void setCooperateTopUnitNameList(List cooperateTopUnitNameList) { - this.cooperateTopUnitNameList = cooperateTopUnitNameList; - } - - public void setReadLeaderIdentityList(List readLeaderIdentityList) { - this.readLeaderIdentityList = readLeaderIdentityList; - } - - public void setReadLeaderNameList(List readLeaderNameList) { - this.readLeaderNameList = readLeaderNameList; - } - - public void setReadLeaderUnitNameList(List readLeaderUnitNameList) { - this.readLeaderUnitNameList = readLeaderUnitNameList; - } - - public void setReadLeaderTopUnitNameList(List readLeaderTopUnitNameList) { - this.readLeaderTopUnitNameList = readLeaderTopUnitNameList; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWfSync.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWfSync.java deleted file mode 100644 index 55f0559846..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWfSync.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoWfSycnService; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionWfSync extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionWfSync.class ); - private OkrWorkBaseInfoWfSycnService okrWorkBaseInfoWfSycnService = new OkrWorkBaseInfoWfSycnService(); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String workInfoId, String wf_workId ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrWorkBaseInfo okrWorkBaseInfo = null; - - if( workInfoId == null || workInfoId.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - try{ - okrWorkBaseInfo = okrWorkBaseInfoService.get( workInfoId ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( workInfoId ); - result.error( exception ); - } - }catch(Exception e){ - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( e, "查询指定ID的具体工作信息时发生异常。ID：" + workInfoId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - //如果存在正在流转的考核流程，那么对比一下该流程workID和wf_workId是否一致 - if( okrWorkBaseInfo.getCurrentAppraiseWorkId() != null && okrWorkBaseInfo.getCurrentAppraiseWorkId().length() > 10 ) { - if( !okrWorkBaseInfo.getCurrentAppraiseWorkId().equalsIgnoreCase(wf_workId) ) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess( "考核流程不一致：工作已经存在正在流转的考核流程，不允许再次绑定考核流程。" ); - result.error( exception ); - }else { - //那么需要进行流转流程同步 - okrWorkBaseInfoWfSycnService.sync(workInfoId, wf_workId); - } - }else { - //那么需要新建一个流程来进行流转流程同步 - okrWorkBaseInfoWfSycnService.sync(workInfoId, wf_workId); - } - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWorkCanDismantling.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWorkCanDismantling.java deleted file mode 100644 index ef671f24a7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/ActionWorkCanDismantling.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; - -public class ActionWorkCanDismantling extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionWorkCanDismantling.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - WrapOutBoolean wrap = new WrapOutBoolean(); - Boolean check = true; - String loginIdentity = null; - OkrUserCache okrUserCache = null; - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check ){ - if( okrUserCache.getLoginIdentityName() == null || okrUserCache.getLoginIdentityName().isEmpty() ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - if( check ){ - loginIdentity = okrUserCache.getLoginIdentityName() ; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - }else{ - try { - if( okrWorkBaseInfoService.canDismantlingWorkByIdentity( id, loginIdentity ) ){ - wrap.setValue( true ); - result.setData( wrap ); - }else{ - wrap.setValue( false ); - result.setData( wrap ); - } - } catch (Exception e) { - result.error( e ); - logger.error(e); - wrap.setValue( false ); - result.setData( wrap ); - } - } - }else{ - wrap.setValue( false ); - result.setData( wrap ); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/BaseAction.java deleted file mode 100644 index c673991f11..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/BaseAction.java +++ /dev/null @@ -1,1528 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.service.OkrAttachmentFileInfoService; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkAppraiseQueryService; -import com.x.okr.assemble.control.service.OkrWorkAuthorizeRecordService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDetailInfoService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; -import com.x.okr.assemble.control.service.OkrWorkProcessIdentityService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkProcessIdentityService okrWorkProcessIdentityService = new OkrWorkProcessIdentityService(); - protected OkrCenterWorkQueryService okrCenterWorkInfoService = new OkrCenterWorkQueryService(); - protected OkrWorkAuthorizeRecordService okrWorkAuthorizeRecordService = new OkrWorkAuthorizeRecordService(); - protected OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - protected OkrWorkDetailInfoService okrWorkDetailInfoService = new OkrWorkDetailInfoService(); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected DateOperation dateOperation = new DateOperation(); - protected OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - protected OkrAttachmentFileInfoService okrAttachmentFileInfoService = new OkrAttachmentFileInfoService(); - protected OkrWorkAppraiseQueryService okrWorkAppraiseQueryService = new OkrWorkAppraiseQueryService(); - - /** - * 根据用户传入的责任者身份信息查询并补充工作对象的责任者相关组织信息 - * - * @param wrapIn - * @return - * @throws Exception - */ - protected WiOkrWorkBaseInfo composeResponsibilityInfoByIdentity(WiOkrWorkBaseInfo wrapIn) throws Exception { - if (wrapIn.getResponsibilityIdentity() != null && !wrapIn.getResponsibilityIdentity().isEmpty()) { - String userName = ""; - String identity = ""; - String unitName = ""; - String topUnitName = ""; - String[] identityNames = null; - identityNames = wrapIn.getResponsibilityIdentity().split(","); - try { - for (String _identity : identityNames) { - if (okrUserManagerService.getPersonNameByIdentity(_identity) == null) { - throw new Exception("person not exsits, identity:" + _identity); - } - if (identity == null || identity.isEmpty()) { - identity += _identity; - } else { - identity += "," + _identity; - } - if (userName == null || userName.isEmpty()) { - userName = okrUserManagerService.getPersonNameByIdentity(_identity); - } else { - userName += "," + okrUserManagerService.getPersonNameByIdentity(_identity); - } - if (unitName == null || unitName.isEmpty()) { - unitName = okrUserManagerService.getUnitNameByIdentity(_identity); - } else { - unitName += "," + okrUserManagerService.getUnitNameByIdentity(_identity); - } - if (topUnitName == null || topUnitName.isEmpty()) { - topUnitName = okrUserManagerService.getTopUnitNameByIdentity(_identity); - } else { - topUnitName += "," + okrUserManagerService.getTopUnitNameByIdentity(_identity); - } - } - wrapIn.setResponsibilityEmployeeName(userName); - wrapIn.setResponsibilityIdentity(identity); - wrapIn.setResponsibilityUnitName(unitName); - wrapIn.setResponsibilityTopUnitName(topUnitName); - } catch (Exception e) { - throw e; - } - } else { - throw new Exception("wrapIn getResponsibilityIdentity is null!"); - } - return wrapIn; - } - - /** - * 根据用户传入的协助者身份信息查询并补充工作对象的协助者相关组织信息 - * - * @param wrapIn - * @return - * @throws Exception - */ - protected WiOkrWorkBaseInfo composeCooperateInfoByIdentity(WiOkrWorkBaseInfo wrapIn) throws Exception { - if ( ListTools.isNotEmpty( wrapIn.getCooperateIdentityList() )) { - List names = new ArrayList<>(); - List identities = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - try { - for ( String _identity : wrapIn.getCooperateIdentityList() ) { - if ( okrUserManagerService.getPersonNameByIdentity(_identity) == null ) { - throw new Exception("person not exsits, identity:" + _identity); - } - identities.add( _identity ); - names.add( okrUserManagerService.getPersonNameByIdentity(_identity) ); - unitNames.add( okrUserManagerService.getUnitNameByIdentity(_identity) ); - topUnitNames.add( okrUserManagerService.getTopUnitNameByIdentity(_identity) ); - } - wrapIn.setCooperateEmployeeNameList(names); - wrapIn.setCooperateIdentityList(identities); - wrapIn.setCooperateUnitNameList(unitNames); - wrapIn.setCooperateTopUnitNameList(topUnitNames); - } catch (Exception e) { - throw e; - } - } else { - wrapIn.setCooperateEmployeeNameList( new ArrayList<>() ); - wrapIn.setCooperateUnitNameList( new ArrayList<>() ); - wrapIn.setCooperateTopUnitNameList( new ArrayList<>() ); - } - return wrapIn; - } - - protected WiOkrWorkBaseInfo composeReadLeaderByIdentity(WiOkrWorkBaseInfo wrapIn) throws Exception { - if ( ListTools.isNotEmpty( wrapIn.getReadLeaderIdentityList() )) { - List names = new ArrayList<>(); - List identities = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - try { - for (String _identity : wrapIn.getReadLeaderIdentityList()) { - if (okrUserManagerService.getPersonNameByIdentity(_identity) == null) { - throw new Exception("person not exsits, identity:" + _identity); - } - identities.add( _identity ); - names.add( okrUserManagerService.getPersonNameByIdentity(_identity) ); - unitNames.add( okrUserManagerService.getUnitNameByIdentity(_identity) ); - topUnitNames.add( okrUserManagerService.getTopUnitNameByIdentity(_identity) ); - } - wrapIn.setReadLeaderNameList(names); - wrapIn.setReadLeaderIdentityList(identities); - wrapIn.setReadLeaderUnitNameList(unitNames); - wrapIn.setReadLeaderTopUnitNameList(topUnitNames); - } catch (Exception e) { - throw e; - } - } else { - wrapIn.setReadLeaderNameList( new ArrayList<>() ); - wrapIn.setReadLeaderUnitNameList( new ArrayList<>() ); - wrapIn.setReadLeaderTopUnitNameList( new ArrayList<>() ); - } - return wrapIn; - } - - /** - * 根据工作信息装配下级工作信息（递归） - * - * @param all_wrapWorkBaseInfoList - * @param wrap_work - * @return - */ - protected WoOkrWorkBaseInfo composeSubWork(List all_wrapWorkBaseInfoList, - WoOkrWorkBaseInfo wrap_work) { - if (all_wrapWorkBaseInfoList != null && !all_wrapWorkBaseInfoList.isEmpty()) { - for (WoOkrWorkBaseInfo work : all_wrapWorkBaseInfoList) { - if (work.getParentWorkId() != null && work.getParentWorkId().equalsIgnoreCase(wrap_work.getId())) { - // 说明该工作是wrap_work的下级工作 - work = composeSubWork(all_wrapWorkBaseInfoList, work); - wrap_work.addNewSubWorkBaseInfo(work); - } - } - } - return wrap_work; - } - - public static class WoOkrCenterWorkInfo extends OkrCenterWorkInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrCenterWorkInfo.class, WoOkrCenterWorkInfo.class, null,JpaObject.FieldsInvisible); - - @FieldDescribe("所有的工作列表") - private List works = null; - - @FieldDescribe("所有的工作类别列表") - private List workTypes = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):CREATEWORK|IMPORTWORK|DEPLOY|ARCHIVE|CLOSE|DELETE") - private List operation = null; - - @FieldDescribe("是否为新创建的草稿信息") - private Boolean isNew = true; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getWorks() { - return works; - } - - public void setWorks(List works) { - this.works = works; - } - - public List getWorkTypes() { - return workTypes; - } - - public void setWorkTypes(List workTypes) { - this.workTypes = workTypes; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - public Boolean getIsNew() { - return isNew; - } - - public void setIsNew(Boolean isNew) { - this.isNew = isNew; - } - - } - - public static class WoOkrCenterWorkViewInfo { - - public static WrapCopier copier = WrapCopierFactory.wo(OkrCenterWorkInfo.class, WoOkrCenterWorkViewInfo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe("中心工作ID") - private String id = ""; - - @FieldDescribe("中心标题") - private String title = ""; - - @FieldDescribe("部署者姓名") - private String deployerName = ""; - - @FieldDescribe("部署者身份") - private String deployerIdentity = ""; - - @FieldDescribe("部署者所属组织") - private String deployerUnitName = ""; - - @FieldDescribe("部署者所属顶层组织") - private String deployerTopUnitName = ""; - - @FieldDescribe("中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消") - private String processStatus = "草稿"; - - @FieldDescribe("中心工作默认完成日期-字符串，显示用：yyyy-mm-dd") - private String defaultCompleteDateLimitStr = ""; - - @FieldDescribe("中心工作默认工作类别") - private String defaultWorkType = ""; - - @FieldDescribe("中心工作默认工作级别") - private String defaultWorkLevel = ""; - - @FieldDescribe("中心工作默认阅知领导(多值)") - private List defaultLeaderList = null; - - @FieldDescribe("中心工作默认阅知领导身份(多值)") - private List defaultLeaderIdentityList = null; - - @FieldDescribe("工作汇报审批领导(多值)") - private List reportAuditLeaderNameList = null; - - @FieldDescribe("工作汇报审批领导身份(多值)") - private List reportAuditLeaderIdentityList = null; - - @FieldDescribe("中心工作是否需要审核") - private Boolean isNeedAudit = false; - - @FieldDescribe("处理状态：正常|已删除") - private String status = "正常"; - - @FieldDescribe("中心工作描述") - private String description = ""; - - @FieldDescribe("工作处理职责身份(多值): VIEW(观察者)|DEPLOY(部署者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)|REPORTAUDIT(汇报审核者)") - private List workProcessIdentity = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):VIEW|EDIT|DELETE") - private List operation = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - public List getDefaultLeaderList() { - return defaultLeaderList == null?new ArrayList<>():defaultLeaderList; - } - - public List getDefaultLeaderIdentityList() { - return defaultLeaderIdentityList == null?new ArrayList<>():defaultLeaderIdentityList; - } - - public List getReportAuditLeaderNameList() { - return reportAuditLeaderNameList == null?new ArrayList<>():reportAuditLeaderNameList; - } - - public List getReportAuditLeaderIdentityList() { - return reportAuditLeaderIdentityList == null?new ArrayList<>():reportAuditLeaderIdentityList; - } - - public void setDefaultLeaderList(List defaultLeaderList) { - this.defaultLeaderList = defaultLeaderList; - } - - public void setDefaultLeaderIdentityList(List defaultLeaderIdentityList) { - this.defaultLeaderIdentityList = defaultLeaderIdentityList; - } - - public void setReportAuditLeaderNameList(List reportAuditLeaderNameList) { - this.reportAuditLeaderNameList = reportAuditLeaderNameList; - } - - public void setReportAuditLeaderIdentityList(List reportAuditLeaderIdentityList) { - this.reportAuditLeaderIdentityList = reportAuditLeaderIdentityList; - } - - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - } - - public static class WoOkrWorkBaseInfo extends OkrWorkBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkBaseInfo.class, WoOkrWorkBaseInfo.class, null, WoOkrWorkBaseInfo.Excludes); - - private List subWrapOutOkrWorkBaseInfos = null; - - private List okrWorkAuthorizeRecords = null; - - private WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - - private String workOutType = "SUBWORK"; - - private String workDetail = null; - - private String dutyDescription = null; - - private String landmarkDescription = null; - - private String majorIssuesDescription = null; - - private String progressAction = null; - - private String progressPlan = null; - - private String resultDescription = null; - - private Boolean hasNoneSubmitReport = false; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getSubWrapOutOkrWorkBaseInfos() { - return subWrapOutOkrWorkBaseInfos; - } - - public void setSubWrapOutOkrWorkBaseInfos(List subWrapOutOkrWorkBaseInfos) { - this.subWrapOutOkrWorkBaseInfos = subWrapOutOkrWorkBaseInfos; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseInfo workBaseInfo) { - if (this.subWrapOutOkrWorkBaseInfos == null) { - this.subWrapOutOkrWorkBaseInfos = new ArrayList(); - } - if (!subWrapOutOkrWorkBaseInfos.contains(workBaseInfo)) { - subWrapOutOkrWorkBaseInfos.add(workBaseInfo); - } - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - /** - * 判断是父级工作还是子工作 - * - * @return - */ - public String getWorkOutType() { - return workOutType; - } - - /** - * 判断是父级工作还是子工作 - * - * @param workOutType - */ - public void setWorkOutType(String workOutType) { - this.workOutType = workOutType; - } - - public List getOkrWorkAuthorizeRecords() { - return okrWorkAuthorizeRecords; - } - - public void setOkrWorkAuthorizeRecords(List okrWorkAuthorizeRecords) { - this.okrWorkAuthorizeRecords = okrWorkAuthorizeRecords; - } - - public WoOkrWorkAuthorizeRecord getOkrWorkAuthorizeRecord() { - return okrWorkAuthorizeRecord; - } - - public void setOkrWorkAuthorizeRecord(WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord) { - this.okrWorkAuthorizeRecord = okrWorkAuthorizeRecord; - } - - public Boolean getHasNoneSubmitReport() { - return hasNoneSubmitReport; - } - - public void setHasNoneSubmitReport(Boolean hasNoneSubmitReport) { - this.hasNoneSubmitReport = hasNoneSubmitReport; - } - - } - - public static class WoOkrWorkBaseSimpleInfo { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkBaseInfo.class, WoOkrWorkBaseSimpleInfo.class, null,JpaObject.FieldsInvisible); - - @FieldDescribe("子工作信息列表") - private List subWorks = null; - - @FieldDescribe("工作ID") - private String id = null; - - @FieldDescribe("上级工作ID") - private String parentWorkId = null; - - @FieldDescribe("工作标题") - private String title = null; - - @FieldDescribe("中心工作ID") - private String centerId = null; - - @FieldDescribe("中心工作标题") - private String centerTitle = null; - - @FieldDescribe("部署者姓名") - private String deployerName = null; - - @FieldDescribe("部署者身份") - private String deployerIdentity = null; - - @FieldDescribe("部署者所属组织") - private String deployerUnitName = null; - - @FieldDescribe("部署者所属顶层组织") - private String deployerTopUnitName = null; - - @FieldDescribe("主责人姓名") - private String responsibilityEmployeeName = null; - - @FieldDescribe("主责人身份") - private String responsibilityIdentity = null; - - @FieldDescribe("主责人所属组织") - private String responsibilityUnitName = null; - - @FieldDescribe("主责人所属顶层组织") - private String responsibilityTopUnitName = null; - - @FieldDescribe("协助人姓名，多值") - private List cooperateEmployeeNameList = null; - - @FieldDescribe("协助人身份，可能多值") - private List cooperateIdentityList = null; - - @FieldDescribe("协助人所属组织，可能多值") - private List cooperateUnitNameList = null; - - @FieldDescribe("协助人所属顶层组织，可能多值") - private List cooperateTopUnitNameList = null; - - @FieldDescribe("阅知领导身份，可能多值") - private List readLeaderIdentityList = null; - - @FieldDescribe("阅知领导，可能多值") - private List readLeaderNameList = null; - - @FieldDescribe("阅知领导所属组织，可能多值") - private List readLeaderUnitNameList = null; - - @FieldDescribe("阅知领导所属顶层组织，可能多值") - private List readLeaderTopUnitNameList = null; - - @FieldDescribe("工作类别") - private String workType = null; - - @FieldDescribe("工作级别") - private String workLevel = null; - - @FieldDescribe("工作进度") - private Integer overallProgress = 0; - - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - private String workProcessStatus = "草稿"; - - @FieldDescribe("工作是否已超期") - private Boolean isOverTime = false; - - @FieldDescribe("工作是否已完成") - private Boolean isCompleted = false; - - @FieldDescribe("工作详细描述, 事项分解") - private String workDetail = null; - - @FieldDescribe("职责描述") - private String dutyDescription = null; - - @FieldDescribe("里程碑标志说明") - private String landmarkDescription = null; - - @FieldDescribe("重点事项说明") - private String majorIssuesDescription = null; - - @FieldDescribe("具体行动举措") - private String progressAction = null; - - @FieldDescribe("进展计划时限说明") - private String progressPlan = null; - - @FieldDescribe("交付成果说明") - private String resultDescription = null; - - @FieldDescribe("是否可以查看工作详情") - private Boolean watch = false; - - @FieldDescribe("完成时限") - private String completeDateLimitStr = null; - - @FieldDescribe("工作处理职责身份(多值): AUTHORZE(授权中)|TACKBACK(授权收回)|AUTHORIZECANCEL(授权失效)|VIEW(观察者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)") - private List workProcessIdentity = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):VIEW|EDIT|SPLIT|AUTHORIZE|TACKBACK|REPORT|DELETE|") - private List operation = null; - - @FieldDescribe("工作信息状态：正常|已删除|已归档") - private String status = "正常"; - - @FieldDescribe("标识工作信息是具体工作,还是中心工作：WORK|CENTER") - private String workOrCenter = "WORK"; - - @FieldDescribe("标识工作信息是否已经被拆解过了,是否存在下级工作信息") - private Boolean hasSubWorks = false; - - @FieldDescribe("归档日期") - private Date archiveDate = null; - - @FieldDescribe("完成日期日期") - private Date completeTime = null; - - @FieldDescribe( "当前考核审核状态" ) - private String currentAppraiseStatus = ""; - - @FieldDescribe( "考核次数" ) - private Integer appraiseTimes = 0; - - private Date createTime; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCenterId() { - return centerId; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public List getSubWorks() { - return subWorks; - } - - public void setSubWorks(List subWorks) { - this.subWorks = subWorks; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public Integer getOverallProgress() { - return overallProgress; - } - - public void setOverallProgress(Integer overallProgress) { - this.overallProgress = overallProgress; - } - - public String getWorkProcessStatus() { - return workProcessStatus; - } - - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - public Boolean getIsOverTime() { - return isOverTime; - } - - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - public Boolean getIsCompleted() { - return isCompleted; - } - - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public String getParentWorkId() { - return parentWorkId; - } - - public void setParentWorkId(String parentWorkId) { - this.parentWorkId = parentWorkId; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseSimpleInfo work) { - if (subWorks == null) { - subWorks = new ArrayList(); - } - subWorks.add(work); - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getWorkOrCenter() { - return workOrCenter; - } - - public void setWorkOrCenter(String workOrCenter) { - this.workOrCenter = workOrCenter; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Boolean getHasSubWorks() { - return hasSubWorks; - } - - public void setHasSubWorks(Boolean hasSubWorks) { - this.hasSubWorks = hasSubWorks; - } - - public Date getArchiveDate() { - return archiveDate; - } - - public Date getCompleteTime() { - return completeTime; - } - - public void setArchiveDate(Date archiveDate) { - this.archiveDate = archiveDate; - } - - public void setCompleteTime(Date completeTime) { - this.completeTime = completeTime; - } - - public String getCurrentAppraiseStatus() { - return currentAppraiseStatus; - } - - public void setCurrentAppraiseStatus(String currentAppraiseStatus) { - this.currentAppraiseStatus = currentAppraiseStatus; - } - - public Integer getAppraiseTimes() { - return appraiseTimes; - } - - public void setAppraiseTimes(Integer appraiseTimes) { - this.appraiseTimes = appraiseTimes; - } - - public List getCooperateEmployeeNameList() { - return cooperateEmployeeNameList == null?new ArrayList<>():cooperateEmployeeNameList; - } - - public List getCooperateIdentityList() { - return cooperateIdentityList == null?new ArrayList<>():cooperateIdentityList; - } - - public List getCooperateUnitNameList() { - return cooperateUnitNameList == null?new ArrayList<>():cooperateUnitNameList; - } - - public List getCooperateTopUnitNameList() { - return cooperateTopUnitNameList == null?new ArrayList<>():cooperateTopUnitNameList; - } - - public List getReadLeaderIdentityList() { - return readLeaderIdentityList == null?new ArrayList<>():readLeaderIdentityList; - } - - public List getReadLeaderNameList() { - return readLeaderNameList == null?new ArrayList<>():readLeaderNameList; - } - - public List getReadLeaderUnitNameList() { - return readLeaderUnitNameList == null?new ArrayList<>():readLeaderUnitNameList; - } - - public List getReadLeaderTopUnitNameList() { - return readLeaderTopUnitNameList == null?new ArrayList<>():readLeaderTopUnitNameList; - } - - public void setCooperateEmployeeNameList(List cooperateEmployeeNameList) { - this.cooperateEmployeeNameList = cooperateEmployeeNameList; - } - - public void setCooperateIdentityList(List cooperateIdentityList) { - this.cooperateIdentityList = cooperateIdentityList; - } - - public void setCooperateUnitNameList(List cooperateUnitNameList) { - this.cooperateUnitNameList = cooperateUnitNameList; - } - - public void setCooperateTopUnitNameList(List cooperateTopUnitNameList) { - this.cooperateTopUnitNameList = cooperateTopUnitNameList; - } - - public void setReadLeaderIdentityList(List readLeaderIdentityList) { - this.readLeaderIdentityList = readLeaderIdentityList; - } - - public void setReadLeaderNameList(List readLeaderNameList) { - this.readLeaderNameList = readLeaderNameList; - } - - public void setReadLeaderUnitNameList(List readLeaderUnitNameList) { - this.readLeaderUnitNameList = readLeaderUnitNameList; - } - - public void setReadLeaderTopUnitNameList(List readLeaderTopUnitNameList) { - this.readLeaderTopUnitNameList = readLeaderTopUnitNameList; - } - } - - public static class WoOkrWorkAuthorizeRecord extends OkrWorkAuthorizeRecord { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkAuthorizeRecord.class, WoOkrWorkAuthorizeRecord.class, null, - JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class WoOkrWorkType { - - @FieldDescribe("工作类别ID") - private String id = null; - - @FieldDescribe("工作类别名称") - private String workTypeName = null; - - @FieldDescribe("工作类别排序号") - private Integer orderNumber = null; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public WoOkrWorkType() { - - } - - public WoOkrWorkType(String id, String name, Integer orderNumber) { - this.id = id; - this.workTypeName = name; - this.orderNumber = orderNumber; - } - - public String getWorkTypeName() { - return workTypeName; - } - - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - - public Integer getOrderNumber() { - return orderNumber; - } - - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; - } - } - - public static class WoOkrAttachmentFileInfo extends OkrAttachmentFileInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrAttachmentFileInfo.class, WoOkrAttachmentFileInfo.class, null, - JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class WoOkrWorkReportBaseSimpleInfo { - - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkReportBaseInfo.class, WoOkrWorkReportBaseSimpleInfo.class, null, - JpaObject.FieldsInvisible); - - @FieldDescribe("汇报ID.") - private String id; - - @FieldDescribe("工作汇报标题") - private String title = null; - - @FieldDescribe("工作汇报短标题") - private String shortTitle = null; - - @FieldDescribe("工作汇报当前环节") - private String activityName = "草稿"; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getShortTitle() { - return shortTitle; - } - - public void setShortTitle(String shortTitle) { - this.shortTitle = shortTitle; - } - - public String getActivityName() { - return activityName; - } - - public void setActivityName(String activityName) { - this.activityName = activityName; - } - } - - public class WoOkrWorkDeployAuthorizeRecord { - - @FieldDescribe("工作ID") - private String workId = ""; - - @FieldDescribe("工作标题") - private String workTitle = ""; - - @FieldDescribe("工作部署|授权操作者身份") - private String source = ""; - - @FieldDescribe("工作部署|授权操作接收者身份") - private String target; - - @FieldDescribe("工作部署|授权操作时间") - private String operationTime; - - @FieldDescribe("工作部署|授权操作类型:授权|收回|部署") - private String operationTypeCN; - - @FieldDescribe("DEPLOY|AUTHORIZE|TACKBACK") - private String operationType; - - @FieldDescribe("工作部署|授权操作意见") - private String opinion; - - private String description = ""; - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getOperationTime() { - return operationTime; - } - - public void setOperationTime(String operationTime) { - this.operationTime = operationTime; - } - - public String getOperationType() { - return operationType; - } - - public void setOperationType(String operationType) { - this.operationType = operationType; - } - - public String getOpinion() { - return opinion; - } - - public void setOpinion(String opinion) { - this.opinion = opinion; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getWorkTitle() { - return workTitle; - } - - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getOperationTypeCN() { - return operationTypeCN; - } - - public void setOperationTypeCN(String operationTypeCN) { - this.operationTypeCN = operationTypeCN; - } - } - - public static class WiOkrWorkBaseInfo extends OkrWorkBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - private List workIds = null; - - // 工作详细信息数据 - private String workDetail = null;// 事项分解 - - private String dutyDescription = null; - - private String landmarkDescription = null; - - private String majorIssuesDescription = null; - - private String progressAction = null; - - private String progressPlan = null; - - private String resultDescription = null; - - private String checkSuccess = "success"; - - private String description = null; - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public String getCheckSuccess() { - return checkSuccess; - } - - public void setCheckSuccess(String checkSuccess) { - this.checkSuccess = checkSuccess; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAction.java deleted file mode 100644 index 4e07298fc2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAction.java +++ /dev/null @@ -1,1222 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.BaseAction.WoOkrCenterWorkInfo; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.BaseAction.WoOkrWorkBaseInfo; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.BaseAction.WoOkrWorkBaseSimpleInfo; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkBaseInfoProcess; - -/** - * 具体工作项有短期工作还长期工作，短期工作不需要自动启动定期汇报，由人工撰稿汇报即可 - */ - -@Path("okrworkbaseinfo") -@JaxrsDescribe("具体工作任务信息管理服务") -public class OkrWorkBaseInfoAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkBaseInfoAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新具体工作任务信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteSave got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "正式部署具体工作任务事项", action = ActionDeploy.class) - @PUT - @Path("deploy") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void deploy(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionDeploy().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDeploy got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID归档具体工作任务事项", action = ActionArchive.class) - @GET - @Path("archive/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void archive(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionArchive().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID对具体工作任务事项进行工作进度调整", action = ActionProgressAdjust.class) - @GET - @Path("progress/{id}/{percent}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void progressAdjust(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id, - @JaxrsParameterDescribe("完成进度百分比") @PathParam("percent") Integer percent) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionProgressAdjust().execute(request, effectivePerson, id, percent); - } catch (Exception e) { - result = new ActionResult<>(); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "收回已经部署具体工作任务事项", action = ActionRecycle.class) - @GET - @Path("recycle/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void recycle(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionRecycle().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteRecycle got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除具体工作任务事项", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取具体工作任务事项", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取具体工作任务事项详细信息，展示用", action = ActionViewWork.class) - @GET - @Path("view/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void view(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionViewWork().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteViewWork got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作的操作内容和用户在工作中的身份", action = ActionGetWorkOperationWithId.class) - @GET - @Path("getOperation/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getOperation(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGetWorkOperationWithId().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteViewWork got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "为工作信息绑定考核流程的信息", action = ActionAppraise.class) - @GET - @Path("appraise/{id}/wf_workid/{wid}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void appraise(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id, - @JaxrsParameterDescribe("流程WORKID") @PathParam("wid") String wid) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionAppraise().execute(request, effectivePerson, id, wid); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteViewWork got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据上级工作ID获取具体工作任务事项", action = ActionListSubWork.class) - @GET - @Path("list/sub/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listSubWork(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListSubWork().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListSubWork got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "判断当前用户是否有权限拆解指定工作.", action = ActionWorkCanDismantling.class) - @GET - @Path("canDismantlingWork/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void canDismantlingWork(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionWorkCanDismantling().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteWorkCanDismantling got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据中心工作ID获取我可以看到的所有具体工作任务事项.", action = ActionListUsersWorkByCenterId.class) - @GET - @Path("center/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listWorkByCenterId(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionListUsersWorkByCenterId().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListUsersWorkByCenterId got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[草稿],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("draft/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listDraftNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryInfoStatus("正常"); - wrapIn.addQueryWorkProcessStatus("草稿"); - wrapIn.addQueryProcessIdentity("部署者"); - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDraftNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[草稿],上一页.", action = ActionListMyWorkByProcessIdentityPrevWithFilter.class) - @PUT - @Path("draft/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listDraftPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryInfoStatus("正常"); - wrapIn.addQueryWorkProcessStatus("草稿"); - wrapIn.addQueryProcessIdentity("部署者"); - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDraftPrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[部署的],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("deployed/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDeployedNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("部署者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDeployNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[部署的],是一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("deployed/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDeployedPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("部署者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDeployPrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[阅知者],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("read/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyReadNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("阅知者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListReadNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[阅知者],上一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("read/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyReadPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("阅知者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListReadPrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[负责的],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("responsibility/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyResponsibilityNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("责任者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListResponsibilityNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[负责的],上一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("responsibility/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyResponsibilityPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("责任者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListResponsibilityPrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[授权的],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("delegate/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDelegateNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("授权者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDelegatedNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[授权的],上一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("delegate/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDelegatePrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("授权者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDelegatedPrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[协助的],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("cooperate/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyCooperateNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("协助者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListCooperateNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[协助的],上一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("cooperate/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyCooperatePrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("协助者"); - wrapIn.addQueryInfoStatus("正常"); - if (wrapIn.getWorkProcessStatuses() == null) { - wrapIn.addQueryWorkProcessStatus("待审核"); - wrapIn.addQueryWorkProcessStatus("待确认"); - wrapIn.addQueryWorkProcessStatus("执行中"); - wrapIn.addQueryWorkProcessStatus("已完成"); - wrapIn.addQueryWorkProcessStatus("已撤消"); - } - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListCooperatePrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[已归档],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("archive/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyArchiveNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryInfoStatus("已归档"); - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListArchiveNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[已归档],上一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("archive/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyArchivePrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryInfoStatus("已归档"); - wrapIn.addQueryProcessIdentity("观察者"); - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListArchivePrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[所有工作],下一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyWorkNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("观察者"); - if (wrapIn.getSequenceField() == null || wrapIn.getSequenceField().isEmpty()) { - wrapIn.setSequenceField("completeDateLimitStr"); - } - result = new ActionListMyWorkByProcessIdentityNextWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWorkSimpleInfoNextWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的具体工作任务事项[所有工作],上一页.", action = ActionListMyWorkByProcessIdentityNextWithFilter.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyWorkPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - WorkCommonSearchFilter wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn(jsonElement, WorkCommonSearchFilter.class); - if (wrapIn == null) { - wrapIn = new WorkCommonSearchFilter(); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkBaseInfoProcess(e, - "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - - if (check) { - try { - wrapIn.setEmployeeNames(null); - wrapIn.setEmployeeIdentities(null); - wrapIn.setTopUnitNames(null); - wrapIn.setUnitNames(null); - wrapIn.setInfoStatuses(null); - wrapIn.setProcessIdentities(null); - wrapIn.addQueryProcessIdentity("观察者"); - if (wrapIn.getSequenceField() == null || wrapIn.getSequenceField().isEmpty()) { - wrapIn.setSequenceField("completeDateLimitStr"); - } - result = new ActionListMyWorkByProcessIdentityPrevWithFilter().execute(request, effectivePerson, id, - count, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWorkSimpleInfoPrevWithFilter got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据中心工作ID获取我部署的所有具体工作任务事项，并且以上级工作进行归类.", action = ActionListDeployWorkInCenterForForm.class) - @GET - @Path("deploy/form/center/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDeployWorkInCenterForForm(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("中心工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListDeployWorkInCenterForForm().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListDeployWorkInCenterForForm got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据中心工作ID获取我需要参与[负责，协助，阅知]的所有具体工作任务事项，并且以上级工作进行归类.", action = ActionListProcessWorkInCenterForForm.class) - @GET - @Path("process/form/center/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyProcessWorkInCenterForForm(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("中心工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListProcessWorkInCenterForForm().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteListProcessWorkInCenterForForm got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "统计登录者所有的工作数量.", action = ActionGetMyWorkStatistic.class) - @GET - @Path("statistic/my") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getMyStatistic(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGetMyWorkStatistic().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGetMyWorkStatistic got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "绑定和同步流程信息", action = ActionRecycle.class) - @GET - @Path("wfsync/{workInfoId}/{wf_workId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void wfSync(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("workInfoId") String workInfoId, - @JaxrsParameterDescribe("考核流程的workId") @PathParam("wf_workId") String wf_workId) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionWfSync().execute(request, effectivePerson, workInfoId, wf_workId); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteRecycle got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAdminAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAdminAction.java deleted file mode 100644 index aa0c7e2469..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/OkrWorkBaseInfoAdminAction.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.BaseAction.WoOkrCenterWorkInfo; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.BaseAction.WoOkrWorkBaseInfo; - -/** - * 具体工作项有短期工作还长期工作，短期工作不需要自动启动定期汇报，由人工撰稿汇报即可 - */ - -@Path("admin/okrworkbaseinfo") -@JaxrsDescribe("具体工作任务信息数据管理服务（管理员）") -public class OkrWorkBaseInfoAdminAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrWorkBaseInfoAdminAction.class); - - @JaxrsMethodDescribe(value = "根据ID获取具体工作任务信息", action = ActionGetForAdmin.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGetForAdmin().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGetForAdminn got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID强制删除具体工作任务信息", action = ActionDeleteForce.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void deleteForce(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - - try { - result = new ActionDeleteForce().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDeleteForce got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据中心工作ID获取我可以看到的所有具体工作任务信息", action = ActionListAllWorkByCenterId.class) - @GET - @Path("center/{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listWorkInCenter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionListAllWorkByCenterId().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListAllWorkByCenterId got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的所有具体工作任务信息,下一页", action = ActionListAllWorkByCenterId.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListAllWorkByCenterId got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的所有具体工作任务信息,上一页", action = ActionListPrevWithFilter.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListAllWorkByCenterId got an exception. "); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/WrapInFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/WrapInFilter.java deleted file mode 100644 index 584a668b22..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/WrapInFilter.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.gson.GsonPropertyObject; - -public class WrapInFilter extends GsonPropertyObject { - - private String query_deployerName; - - private String query_deployerUnitName; - - private String query_deployerTopUnitName; - - private String title ; - - private String processIdentity; - - private List workIds; - - private List workProcessStatusList; - - private List deployerNames; - - private List deployerUnitNames; - - private List deployerTopUnitNames; - - private String query_creatorName; - - private String query_creatorUnitName; - - private String query_creatorTopUnitName; - - private List creatorNames; - - private List creatorUnitNames; - - private List creatorTopUnitNames; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String key; - - private String order = "DESC"; - - private List q_statuses; - - public String getQuery_deployerName() { - return query_deployerName; - } - - public void setQuery_deployerName(String query_deployerName) { - this.query_deployerName = query_deployerName; - } - - public String getQuery_deployerUnitName() { - return query_deployerUnitName; - } - - public void setQuery_deployerUnitName(String query_deployerUnitName) { - this.query_deployerUnitName = query_deployerUnitName; - } - - public String getQuery_deployerTopUnitName() { - return query_deployerTopUnitName; - } - - public void setQuery_deployerTopUnitName(String query_deployerTopUnitName) { - this.query_deployerTopUnitName = query_deployerTopUnitName; - } - - public List getDeployerNames() { - return deployerNames; - } - - public void setDeployerNames(List deployerNames) { - this.deployerNames = deployerNames; - } - - public List getDeployerUnitNames() { - return deployerUnitNames; - } - - public void setDeployerUnitNames(List deployerUnitNames) { - this.deployerUnitNames = deployerUnitNames; - } - - public List getDeployerTopUnitNames() { - return deployerTopUnitNames; - } - - public void setDeployerTopUnitNames(List deployerTopUnitNames) { - this.deployerTopUnitNames = deployerTopUnitNames; - } - - public String getQuery_creatorName() { - return query_creatorName; - } - - public void setQuery_creatorName(String query_creatorName) { - this.query_creatorName = query_creatorName; - } - - public String getQuery_creatorUnitName() { - return query_creatorUnitName; - } - - public void setQuery_creatorUnitName(String query_creatorUnitName) { - this.query_creatorUnitName = query_creatorUnitName; - } - - public String getQuery_creatorTopUnitName() { - return query_creatorTopUnitName; - } - - public void setQuery_creatorTopUnitName(String query_creatorTopUnitName) { - this.query_creatorTopUnitName = query_creatorTopUnitName; - } - - public List getCreatorNames() { - return creatorNames; - } - - public void setCreatorNames(List creatorNames) { - this.creatorNames = creatorNames; - } - - public List getCreatorUnitNames() { - return creatorUnitNames; - } - - public void setCreatorUnitNames(List creatorUnitNames) { - this.creatorUnitNames = creatorUnitNames; - } - - public List getCreatorTopUnitNames() { - return creatorTopUnitNames; - } - - public void setCreatorTopUnitNames(List creatorTopUnitNames) { - this.creatorTopUnitNames = creatorTopUnitNames; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public List getWorkProcessStatusList() { - return workProcessStatusList; - } - - public void setWorkProcessStatusList(List workProcessStatusList) { - this.workProcessStatusList = workProcessStatusList; - } - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public String getProcessIdentity() { - return processIdentity; - } - - public void setProcessIdentity(String processIdentity) { - this.processIdentity = processIdentity; - } - - public List getQ_statuses() { - return q_statuses; - } - - public void setQ_statuses(List q_statuses ) { - this.q_statuses = q_statuses; - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryInfoStatus( String status ) { - if( q_statuses == null ){ - q_statuses = new ArrayList(); - } - if( !q_statuses.contains( status )){ - q_statuses.add( status ); - } - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryWorkProcessStatus( String status ) { - if( workProcessStatusList == null ){ - workProcessStatusList = new ArrayList(); - } - if( !workProcessStatusList.contains( status )){ - workProcessStatusList.add( status ); - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkIdEmpty.java deleted file mode 100644 index 0c0e20675e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkIdEmpty() { - super("中心工作id为空，无法进行保存或者查询。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkNotExists.java deleted file mode 100644 index 4dcca758dc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionCenterWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkNotExists( String id ) { - super("指定ID的中心工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 59bd5ef457..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionInsufficientPermissions.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionInsufficientPermissions.java deleted file mode 100644 index 4eaef59873..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionInsufficientPermissions.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionInsufficientPermissions extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionInsufficientPermissions( String name, String role ) { - super("操作权限不足。Name:" + name + ", Role:" + role ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportCycleInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportCycleInvalid.java deleted file mode 100644 index cfa44030b3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportCycleInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportCycleInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportCycleInvalid( String cycle ) { - super("汇报周期选择不正确："+ cycle +"，无法继续保存工作信息!" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleEmpty.java deleted file mode 100644 index 477e23ba28..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDayInCycleEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDayInCycleEmpty() { - super("每周汇报日为空，无法继续保存工作信息!" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleInvalid.java deleted file mode 100644 index 7efeddbfe4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionReportDayInCycleInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDayInCycleInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDayInCycleInvalid( int cycle ) { - super("每周汇报日选择不正确："+ cycle +"，无法继续保存工作信息!" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 383bd54893..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWfWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWfWorkIdEmpty.java deleted file mode 100644 index ac8cc73d9f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWfWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWfWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWfWorkIdEmpty() { - super("绑定的流程workid为空，无法进行绑定。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkBaseInfoProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkBaseInfoProcess.java deleted file mode 100644 index 7c520dfab7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkBaseInfoProcess.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkBaseInfoProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkBaseInfoProcess( Throwable e, String message ) { - super( message, e ); - } - public ExceptionWorkBaseInfoProcess( String message ) { - super( message ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCanNotDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCanNotDelete.java deleted file mode 100644 index 13093e8b0c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCanNotDelete.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import java.util.List; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkCanNotDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkCanNotDelete( List ids ) { - super("工作仍存在"+ ids.size() +"个下级工作，该工作暂无法删除." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCompleteDateLimitEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCompleteDateLimitEmpty.java deleted file mode 100644 index 84544fb5dc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCompleteDateLimitEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkCompleteDateLimitEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkCompleteDateLimitEmpty() { - super("工作完成时限为空，无法进行工作保存。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCooperateInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCooperateInvalid.java deleted file mode 100644 index 1ac29038ad..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkCooperateInvalid.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import java.util.List; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkCooperateInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkCooperateInvalid( Throwable e, List personList ) { - super("系统根据用户所选择的协助者身份为工作信息组织协助者信息时发生异常。Person:" + personList.toString(), e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkDetailEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkDetailEmpty.java deleted file mode 100644 index 8b7fdfd07f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkDetailEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDetailEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDetailEmpty() { - super("工作描述内容为空，无法进行工作保存。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkIdEmpty.java deleted file mode 100644 index f1aec31320..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkIdEmpty() { - super("id为空，无法进行流程绑定。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkNotExists.java deleted file mode 100644 index 91590680d3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("指定ID的具体工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkReadLeaderInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkReadLeaderInvalid.java deleted file mode 100644 index 834b7eecb9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkReadLeaderInvalid.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - - -import java.util.List; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReadLeaderInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReadLeaderInvalid( Throwable e, List personList ) { - super("系统根据用户所选择的阅知者身份为工作信息组织阅知者信息时发生异常。Person:" + personList.toString() , e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityEmpty.java deleted file mode 100644 index 3aeca80419..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkResponsibilityEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkResponsibilityEmpty() { - super("工作责任者身份为空，无法进行工作保存。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityInvalid.java deleted file mode 100644 index 66b78988c0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkbaseinfo/exception/ExceptionWorkResponsibilityInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkResponsibilityInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkResponsibilityInvalid( Throwable e, String person ) { - super("系统根据用户所选择的责任者身份为工作信息组织责任者信息时发生异常。Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionDelete.java deleted file mode 100644 index 121931adc4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionDelete.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatDelete; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatQueryById; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkChat; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkChat okrWorkChat = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ) { - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - - if( check ) { - try { - okrWorkChat = okrWorkChatService.get( id ); - if( okrWorkChat == null ){ - Exception exception = new ExceptionWorkChatNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkChatQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ) { - try{ - okrWorkChatService.delete( id ); - result.setData( new Wo(id) ); - }catch(Exception e){ - Exception exception = new ExceptionWorkChatDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ) { - if( okrWorkChat != null ) { - WrapInWorkDynamic.sendWithWorkChat( okrWorkChat, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "删除工作交流信息", - "工作交流信息删除成功！" - ); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionGet.java deleted file mode 100644 index 772207707f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionGet.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatQueryById; -import com.x.okr.entity.OkrWorkChat; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkChat okrWorkChat = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkChatIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkChat = okrWorkChatService.get( id ); - if( okrWorkChat != null ){ - wrap = Wo.copier.copy( okrWorkChat ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionWorkChatNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkChatQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrWorkChat{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkChat.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterNext.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterNext.java deleted file mode 100644 index 3be4e7af8b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterNext.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatFilter; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; - -public class ActionListWithFilterNext extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithFilterNext.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult>(); - List wrapOutOkrWorkChatList = null; - List chatList = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - Long total = 0L; - Boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( count == null ){ - count = 20; - } - if( check ){ - //对wrapIn里的信息进行校验 - if( okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - //对wrapIn里的信息进行校验 - if( wrapIn.getWorkId() == null || wrapIn.getWorkId().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - chatList = okrWorkChatService.listChatNextWithFilter( id, count, wrapIn.getWorkId(), wrapIn.getSequenceField(), wrapIn.getOrder() ); - total = okrWorkChatService.getChatCountWithFilter( wrapIn.getWorkId() ); - wrapOutOkrWorkChatList = Wo.copier.copy(chatList); - result.setData( wrapOutOkrWorkChatList ); - result.setCount( total ); - }catch(Exception e){ - Exception exception = new ExceptionWorkChatFilter( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe( "用于查询的具体工作项ID." ) - private String workId; - - @FieldDescribe( "用于列表排序的属性." ) - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe( "用于列表排序的方式." ) - private String order = "DESC"; - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - } - - public static class Wo extends OkrWorkChat{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkChat.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterPrev.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterPrev.java deleted file mode 100644 index 9634f9e913..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionListWithFilterPrev.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatFilter; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; - -public class ActionListWithFilterPrev extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithFilterPrev.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult>(); - List wrapOutOkrWorkChatList = null; - List chatList = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - Long total = 0L; - boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( count == null ){ - count = 20; - } - - if( check ){ - //对wrapIn里的信息进行校验 - if( okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - //对wrapIn里的信息进行校验 - if( wrapIn.getWorkId() == null || wrapIn.getWorkId().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - chatList = okrWorkChatService.listChatPrevWithFilter( id, count, wrapIn.getWorkId(), wrapIn.getSequenceField(), wrapIn.getOrder() ); - total = okrWorkChatService.getChatCountWithFilter( wrapIn.getWorkId() ); - wrapOutOkrWorkChatList = Wo.copier.copy(chatList); - result.setData( wrapOutOkrWorkChatList ); - result.setCount( total ); - }catch(Exception e){ - Exception exception = new ExceptionWorkChatFilter( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - -public static class Wi extends GsonPropertyObject { - - @FieldDescribe( "用于查询的具体工作项ID." ) - private String workId; - - @FieldDescribe( "用于列表排序的属性." ) - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe( "用于列表排序的方式." ) - private String order = "DESC"; - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - } - - public static class Wo extends OkrWorkChat{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkChat.class, Wo.class, null,JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionSave.java deleted file mode 100644 index 1edfa54871..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/ActionSave.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkChatSave; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - public ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult< Wo > result = new ActionResult<>(); - OkrWorkChat okrWorkChat = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - Boolean check = true; - Wi wrapIn = null; - OkrUserCache okrUserCache = null; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - //对wrapIn里的信息进行校验 - if( okrUserCache.getLoginUserName() == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - //校验工作ID是否合法 - if( wrapIn.getWorkId() == null || wrapIn.getWorkId().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - - if( check ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - wrapIn.setSenderName( okrUserCache.getLoginUserName() ); - wrapIn.setSenderIdentity( okrUserCache.getLoginIdentityName() ); - wrapIn.setCenterId( okrWorkBaseInfo.getCenterId() ); - wrapIn.setCenterTitle( okrWorkBaseInfo.getCenterTitle() ); - wrapIn.setWorkId( okrWorkBaseInfo.getId() ); - wrapIn.setWorkTitle( okrWorkBaseInfo.getTitle() ); - } - - if( check ){ - try { - okrWorkChat = okrWorkChatService.save( wrapIn ); - result.setData( new Wo( okrWorkChat.getId() ) ); - } catch (Exception e) { - result.error( e ); - Exception exception = new ExceptionWorkChatSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( okrWorkChat != null ) { - WrapInWorkDynamic.sendWithWorkChat( okrWorkChat, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "发送工作交流信息", - "工作交流信息发送成功！" - ); - } - } - return result; - } - - public static class Wi extends OkrWorkChat { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/BaseAction.java deleted file mode 100644 index 02a657659f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/BaseAction.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkChatService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkChatService okrWorkChatService = new OkrWorkChatService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/OkrWorkChatAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/OkrWorkChatAction.java deleted file mode 100644 index 22ab15db14..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/OkrWorkChatAction.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrworkchat") -@JaxrsDescribe("工作交流信息管理服务") -public class OkrWorkChatAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkChatAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作交流信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteSave got an exception. "); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作交流信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作交流信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteDelete got an exception. id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作交流信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作交流信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteGet got an exception. id:" + id); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根满足滤条件的工作交流信息,上一页", action = ActionListWithFilterPrev.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listPrevWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionListWithFilterPrev().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWithFilterPrev got an exception. id:" + id); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根满足滤条件的工作交流信息,下一页", action = ActionListWithFilterNext.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listNextWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionListWithFilterNext().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWithFilterNext got an exception. id:" + id); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 64e71714b0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionUserNoLogin.java deleted file mode 100644 index a960d68c02..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatDelete.java deleted file mode 100644 index a9128fe010..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkChatDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkChatDelete( Throwable e, String id ) { - super("系统根据ID删除指定的工作交流信息记录时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatFilter.java deleted file mode 100644 index 7914f79e16..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatFilter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkChatFilter extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkChatFilter( Throwable e ) { - super("系统条件查询工作交流信息记录列表时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatIdEmpty.java deleted file mode 100644 index 39a8ad27b3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkChatIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkChatIdEmpty() { - super("id为空，无法进行查询操作。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatNotExists.java deleted file mode 100644 index 258fec83dd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkChatNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkChatNotExists( String id ) { - super("指定的工作交流信息记录不存在。ID:" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatQueryById.java deleted file mode 100644 index 01f225b4e6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkChatQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkChatQueryById( Throwable e, String id ) { - super("系统根据ID查询指定的工作交流信息记录时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatSave.java deleted file mode 100644 index 29e6f8d856..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkChatSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkChatSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkChatSave( Throwable e ) { - super("系统保存工作交流信息记录时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkIdEmpty.java deleted file mode 100644 index 9d41224033..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkIdEmpty() { - super("id为空，无法进行查询。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkNotExists.java deleted file mode 100644 index 294294e07b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("指定ID的具体工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkQueryById.java deleted file mode 100644 index 9d0635089a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkQueryById( Throwable e, String id ) { - super("查询指定ID的具体工作信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWrapInConvert.java deleted file mode 100644 index f2f543d2e0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkchat/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkchat.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionDelete.java deleted file mode 100644 index 4fea0d1015..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionDelete.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception.ExceptionWorkDetailDelete; -import com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception.ExceptionWorkIdEmpty; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - }else{ - try{ - okrWorkDetailInfoService.delete( id ); - result.setData( new Wo(id) ); - }catch(Exception e){ - Exception exception = new ExceptionWorkDetailDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionGet.java deleted file mode 100644 index 7460882a38..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionGet.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception.ExceptionWorkQueryById; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - - Wo wrap = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - try { - okrWorkDetailInfo = okrWorkDetailInfoService.get( id ); - if( okrWorkDetailInfo != null ){ - wrap = Wo.copier.copy( okrWorkDetailInfo ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionWorkNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - - public static class Wo extends OkrWorkDetailInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkDetailInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionSave.java deleted file mode 100644 index fcdb36a537..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/ActionSave.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception.ExceptionWorkDetailSave; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check ){ - if( wrapIn.getId() == null ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - if( check ){ - //查询工作信息，补充工作详细信息的ID - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getId() ); - result.error( exception ); - }else{ - wrapIn.setCenterId( okrWorkBaseInfo.getCenterId() ); //ID需要查询确认一下，数据一定要有效 - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - try { - okrWorkDetailInfoService.save( wrapIn ); - result.setData( new Wo(wrapIn.getId()) ); - } catch (Exception e) { - Exception exception = new ExceptionWorkDetailSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrWorkDetailInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/BaseAction.java deleted file mode 100644 index f966ff4e34..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/BaseAction.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDetailInfoService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkDetailInfoService okrWorkDetailInfoService = new OkrWorkDetailInfoService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/OkrWorkDetailInfoAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/OkrWorkDetailInfoAction.java deleted file mode 100644 index 6c76f2fe87..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/OkrWorkDetailInfoAction.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkchat.ActionSave; - -@Path("okrworkdetailinfo") -@JaxrsDescribe("工作详细信息管理服务") -public class OkrWorkDetailInfoAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrWorkDetailInfoAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作详细信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void post(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作详细信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作详细信息", action = ActionDelete.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailDelete.java deleted file mode 100644 index 2c212c3a5b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDetailDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDetailDelete( Throwable e, String id ) { - super("系统在删除工作详细信息时发生异常. ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailSave.java deleted file mode 100644 index de2c2ad502..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkDetailSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDetailSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDetailSave( Throwable e ) { - super("系统在保存工作详细信息时发生异常.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkIdEmpty.java deleted file mode 100644 index d29c3013c0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkIdEmpty() { - super("工作ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkNotExists.java deleted file mode 100644 index 772a3c965c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("指定ID的具体工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkQueryById.java deleted file mode 100644 index f44fff50bd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkQueryById( Throwable e, String id ) { - super("查询指定ID的具体工作信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWrapInConvert.java deleted file mode 100644 index b194e0628a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdetailinfo/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdetailinfo.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionDelete.java deleted file mode 100644 index 3cdbf137b1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionDelete.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsDelete; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsIdEmpty; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDelete.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkDynamicsIdEmpty(); - result.error( exception ); - }else{ - try{ - okrWorkDynamicsService.delete( id ); - result.setData( new Wo( id )); - }catch( Exception e ){ - Exception exception = new ExceptionWorkDynamicsDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionGet.java deleted file mode 100644 index dc4709c991..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionGet.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsQueryById; -import com.x.okr.entity.OkrWorkDynamics; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkDynamics okrWorkDynamics = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionWorkDynamicsIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkDynamics = okrWorkDynamicsService.get( id ); - if( okrWorkDynamics != null ){ - wrap = Wo.copier.copy( okrWorkDynamics ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionWorkDynamicsNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkDynamicsQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrWorkDynamics{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkDynamics.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } - - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterNext.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterNext.java deleted file mode 100644 index f694f25dbf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterNext.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionDeployWorkIdsQuery; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionViewableWorkIdsQuery; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsFilter; -import com.x.okr.entity.OkrWorkDynamics; - -public class ActionListWithFilterNext extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithFilterNext.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult>(); - EffectivePerson currentPerson = this.effectivePerson(request); - List wrapOutOkrWorkDynamicsList = null; - List dynamicsList = null; - List deploy_ids = null; - List work_ids = null; - List statuses = new ArrayList(); - OkrUserCache okrUserCache = null; - String identity = null; - Long total = 0L; - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( currentPerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, currentPerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( currentPerson.getDistinguishedName() ); - result.error( exception ); - } - if( count == null ){ - count = 20; - } - - if( check ){ - identity = okrUserCache.getLoginIdentityName(); - if( identity == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( currentPerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - statuses.add( "正常" ); - - //计算可以查看的范围 - if( okrUserCache.isOkrManager() ){ - logger.debug( "用户是OkrSystemAdmin." ); - //如果是系统管理员，可以查看全部，不需要进行ID过滤 - wrapIn.setCenterIds( null ); - wrapIn.setWorkId( null ); - wrapIn.setOkrSystemAdmin(true); - }else{ - wrapIn.setOkrSystemAdmin(false); - //如果不是管理员： - //先查询用户部署的中心工作ID，这些中心工作可以全部看到 - try { - deploy_ids = okrWorkPersonService.listDistinctCenterIdsByPersonIdentity( identity, "部署者", statuses ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionDeployWorkIdsQuery( e, identity ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - - //再查询不在deploy_ids这些中心工作下面可以观察的的其他工作的IDS - try { - work_ids = okrWorkPersonService.listDistinctWorkIdsByPersonIndentity( null, identity, "观察者", deploy_ids ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionViewableWorkIdsQuery( e, identity ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - wrapIn.setWorkIds( work_ids ); - wrapIn.setCenterIds( deploy_ids ); - } - } - - if( check ){ - wrapIn.setUserIdentity( identity ); - try{ - dynamicsList = okrWorkDynamicsService.listDynamicNextWithFilter( id, count, wrapIn.getCenterIds(), - wrapIn.getWorkIds(), wrapIn.getSequenceField(), wrapIn.getOrder(), wrapIn.isOkrManager() ); - wrapOutOkrWorkDynamicsList = Wo.copier.copy( dynamicsList ); - total = okrWorkDynamicsService.getDynamicCountWithFilter( wrapIn.getCenterIds(), - wrapIn.getWorkIds(), wrapIn.getSequenceField(), wrapIn.getOrder(), wrapIn.isOkrManager() ); - result.setData( wrapOutOkrWorkDynamicsList ); - result.setCount( total ); - }catch(Exception e){ - Exception exception = new ExceptionWorkDynamicsFilter( e ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - private String workId; - - private List centerIds = null; - - private List workIds = null; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String userIdentity = null; - - private String key; - - private String order = "DESC"; - - private boolean isOkrManager = false; - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getUserIdentity() { - return userIdentity; - } - - public void setUserIdentity(String userIdentity) { - this.userIdentity = userIdentity; - } - - public List getCenterIds() { - return centerIds; - } - - public void setCenterIds(List centerIds) { - this.centerIds = centerIds; - } - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public boolean isOkrManager() { - return isOkrManager; - } - - public void setOkrSystemAdmin(boolean isOkrManager) { - this.isOkrManager = isOkrManager; - } - - } - - public static class Wo extends OkrWorkDynamics{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkDynamics.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterPrev.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterPrev.java deleted file mode 100644 index f3d78fa8ff..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionListWithFilterPrev.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionDeployWorkIdsQuery; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionViewableWorkIdsQuery; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsFilter; -import com.x.okr.entity.OkrWorkDynamics; - -public class ActionListWithFilterPrev extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListWithFilterPrev.class ); - - protected ActionResult> execute( HttpServletRequest request,EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult>(); - EffectivePerson currentPerson = this.effectivePerson(request); - List wrapOutOkrWorkDynamicsList = null; - List dynamicsList = null; - List deploy_ids = null; - List work_ids = null; - List statuses = new ArrayList(); - OkrUserCache okrUserCache = null; - String identity = null; - Long total = 0L; - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( currentPerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, currentPerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( currentPerson.getDistinguishedName() ); - result.error( exception ); - } - if( count == null ){ - count = 20; - } - - if( check ){ - identity = okrUserCache.getLoginIdentityName(); - if( identity == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( currentPerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - statuses.add( "正常" ); - - //计算可以查看的范围 - if( okrUserCache.isOkrManager() ){ - logger.debug( "用户是OkrSystemAdmin." ); - //如果是系统管理员，可以查看全部，不需要进行ID过滤 - wrapIn.setCenterIds( null ); - wrapIn.setWorkId( null ); - wrapIn.setOkrSystemAdmin(true); - }else{ - wrapIn.setOkrSystemAdmin(false); - //如果不是管理员： - //先查询用户部署的中心工作ID，这些中心工作可以全部看到 - try { - deploy_ids = okrWorkPersonService.listDistinctCenterIdsByPersonIdentity( identity, "部署者", statuses ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionDeployWorkIdsQuery( e, identity ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - - //再查询不在deploy_ids这些中心工作下面可以观察的的其他工作的IDS - try { - work_ids = okrWorkPersonService.listDistinctWorkIdsByPersonIndentity( null, identity, "观察者", deploy_ids ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionViewableWorkIdsQuery( e, identity ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - wrapIn.setWorkIds( work_ids ); - wrapIn.setCenterIds( deploy_ids ); - } - } - - if( check ){ - wrapIn.setUserIdentity( identity ); - try{ - dynamicsList = okrWorkDynamicsService.listDynamicPrevWithFilter( id, count, wrapIn.getCenterIds(), - wrapIn.getWorkIds(), wrapIn.getSequenceField(), wrapIn.getOrder(), wrapIn.isOkrManager() ); - wrapOutOkrWorkDynamicsList = Wo.copier.copy( dynamicsList ); - total = okrWorkDynamicsService.getDynamicCountWithFilter( wrapIn.getCenterIds(), - wrapIn.getWorkIds(), wrapIn.getSequenceField(), wrapIn.getOrder(), wrapIn.isOkrManager() ); - result.setData( wrapOutOkrWorkDynamicsList ); - result.setCount( total ); - }catch(Exception e){ - Exception exception = new ExceptionWorkDynamicsFilter( e ); - result.error( exception ); - logger.error( e, currentPerson, request, null); - } - }else{ - result.setCount( 0L ); - result.setData( new ArrayList() ); - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - private String workId; - - private List centerIds = null; - - private List workIds = null; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String userIdentity = null; - - private String key; - - private String order = "DESC"; - - private boolean isOkrManager = false; - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getUserIdentity() { - return userIdentity; - } - - public void setUserIdentity(String userIdentity) { - this.userIdentity = userIdentity; - } - - public List getCenterIds() { - return centerIds; - } - - public void setCenterIds(List centerIds) { - this.centerIds = centerIds; - } - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public boolean isOkrManager() { - return isOkrManager; - } - - public void setOkrSystemAdmin(boolean isOkrManager) { - this.isOkrManager = isOkrManager; - } - - } - - public static class Wo extends OkrWorkDynamics{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkDynamics.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionSave.java deleted file mode 100644 index ffc9fab2c5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/ActionSave.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkchat.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception.ExceptionWorkDynamicsSave; -import com.x.okr.entity.OkrWorkDynamics; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkDynamics okrWorkDynamics = null; - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - okrWorkDynamics = okrWorkDynamicsService.save( wrapIn ); - result.setData( new Wo( okrWorkDynamics.getId() )); - } catch (Exception e) { - Exception exception = new ExceptionWorkDynamicsSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrWorkDynamics { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/BaseAction.java deleted file mode 100644 index 201f8515db..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/BaseAction.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.assemble.control.service.OkrWorkPersonService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/OkrWorkDynamicsAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/OkrWorkDynamicsAction.java deleted file mode 100644 index 0d5bd37ec2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/OkrWorkDynamicsAction.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrworkdynamics") -@JaxrsDescribe("系统动态信息管理服务") -public class OkrWorkDynamicsAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkDynamicsAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新系统动态信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void post(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除系统动态信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作动态信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取系统动态信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作动态信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件的系统动态信息,下一页", action = ActionListWithFilterNext.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listNextWithFilter(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionListWithFilterNext().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("system excute ExcuteListWithFilterPrev got an exception."); - logger.error(e, effectivePerson, request, null); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionDeployWorkIdsQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionDeployWorkIdsQuery.java deleted file mode 100644 index efcc361814..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionDeployWorkIdsQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionDeployWorkIdsQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionDeployWorkIdsQuery( Throwable e, String identity ) { - super("系统获取用户部署的中心工作时发生异常. Person:" + identity, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index 3196cee8bb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionUserNoLogin.java deleted file mode 100644 index d9f06ef3cf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionViewableWorkIdsQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionViewableWorkIdsQuery.java deleted file mode 100644 index 3849e5b9d4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionViewableWorkIdsQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionViewableWorkIdsQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionViewableWorkIdsQuery( Throwable e, String identity ) { - super("系统获取用户可访问的中心工作时发生异常. Person:" + identity, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsDelete.java deleted file mode 100644 index 1770754f75..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDynamicsDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDynamicsDelete( Throwable e, String id ) { - super("系统在删除操作动态信息时发生异常. ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsFilter.java deleted file mode 100644 index ebee4ae2a0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsFilter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDynamicsFilter extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDynamicsFilter( Throwable e ) { - super("系统根据条件查询操作动态信息列表时发生异常." , e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsIdEmpty.java deleted file mode 100644 index ee332770b5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDynamicsIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDynamicsIdEmpty() { - super("操作动态ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsNotExists.java deleted file mode 100644 index 6941851c57..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDynamicsNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDynamicsNotExists( String id ) { - super("指定ID的操作动态信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsQueryById.java deleted file mode 100644 index dfd61aa7c7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDynamicsQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDynamicsQueryById( Throwable e, String id ) { - super("查询指定ID的操作动态信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsSave.java deleted file mode 100644 index 4a61115e23..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWorkDynamicsSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkDynamicsSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkDynamicsSave( Throwable e ) { - super("系统在保存操作动态信息时发生异常.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 36b7908e4d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkdynamics/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkdynamics.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapInOkrWorkPerson.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapInOkrWorkPerson.java deleted file mode 100644 index 980ea39e3f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapInOkrWorkPerson.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkperson; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.okr.entity.OkrWorkPerson; - -public class WrapInOkrWorkPerson extends OkrWorkPerson { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapOutOkrWorkPerson.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapOutOkrWorkPerson.java deleted file mode 100644 index 94e40dd81f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkperson/WrapOutOkrWorkPerson.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkperson; - -import java.util.ArrayList; -import java.util.List; - -import com.x.okr.entity.OkrWorkPerson; - -public class WrapOutOkrWorkPerson extends OkrWorkPerson { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionAutoCreateWorkReport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionAutoCreateWorkReport.java deleted file mode 100644 index c8bf5e93c6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionAutoCreateWorkReport.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.ExcuteWorkReportCreateService; - -public class ActionAutoCreateWorkReport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionAutoCreateWorkReport.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson ) throws Exception { - WrapOutBoolean wrapOutBoolean = new WrapOutBoolean(); - ActionResult result = new ActionResult<>(); - try { - new ExcuteWorkReportCreateService().execute(); - wrapOutBoolean.setValue( true ); - result.setData( wrapOutBoolean ); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "system excute reportAutoCreate got an exception. " ); - logger.error( e ); - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDelete.java deleted file mode 100644 index df91e8e781..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDelete.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportDelete; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDelete.class); - - protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String id) - throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - List taskList = null; - List taskTargetName = new ArrayList(); - Boolean check = true; - OkrUserCache okrUserCache = null; - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if (check) { - if (id == null || id.isEmpty()) { - check = false; - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error(exception); - } - } - - if (check) { - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get(id); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById(e, id); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - try { - okrWorkReportOperationService.delete(id, effectivePerson.getDistinguishedName()); - result.setData(new Wo(id)); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportDelete(e, id); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if (check) { - try { - taskList = okrTaskService.listIdsByReportId(id); - } catch (Exception e) { - check = false; - logger.warn("system get task by report id got an exception"); - logger.error(e); - } - } - - if (check) { - if (taskList != null && !taskList.isEmpty()) { - List workTypeList = new ArrayList(); - for (OkrTask task : taskList) { - if (!taskTargetName.contains(task.getTargetIdentity())) { - try { - workTypeList.clear(); - workTypeList.add(task.getWorkType()); - okrWorkReportTaskCollectService.checkReportCollectTask(task.getTargetIdentity(), workTypeList); - } catch (Exception e) { - logger.warn("待办信息删除成功，但对汇报者进行汇报待办汇总发生异常。"); - logger.error(e); - } - } - } - } - } - - if (check) { - if ( okrWorkReportBaseInfo != null) { - WrapInWorkDynamic.sendWithWorkReport( okrWorkReportBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "删除工作汇报信息", - "工作汇报信息删除成功！" - ); - } - } - - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDispatchToOver.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDispatchToOver.java deleted file mode 100644 index 50095c9fb0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDispatchToOver.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportDispatchOver; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -/** - * 将汇报信息调度到结束 - * 1、汇报信息的信息状态修改为“结束”，详细信息里状态修改为“结束” - * 2、汇报信息的当前处理环节“结束” - * 3、汇报信息待办信息 - * 4、汇报信息待办汇总信息 - * 5、汇报信息处理记录里添加系统处理记录 - * 6、PERSONLINK记录里的处理状态修改为“结束” - * @author liyi_ - * - */ -public class ActionDispatchToOver extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDispatchToOver.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String reportId ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrUserCache okrUserCache = null; - - if( check ){ - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check && ( okrUserCache == null || okrUserCache.getLoginIdentityName() == null ) ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if (check) { - if (reportId == null || reportId.isEmpty()) { - check = false; - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error(exception); - } - } - - if (check) { - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( reportId ); - if( okrWorkReportBaseInfo == null ) { - check = false; - Exception exception = new ExceptionWorkReportNotExists( reportId ); - result.error(exception); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById(e, reportId ); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if (check) { - try{ - okrWorkReportFlowService.dispatchToOver( reportId ); - result.setData(new Wo( reportId )); - }catch(Exception e){ - Exception exception = new ExceptionWorkReportDispatchOver( e, reportId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if ( okrWorkReportBaseInfo != null) { - WrapInWorkDynamic.sendWithWorkReport( okrWorkReportBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "调度工作汇报信息", - "工作汇报信息调度成功！" - ); - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDraftReport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDraftReport.java deleted file mode 100644 index e0a589843a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionDraftReport.java +++ /dev/null @@ -1,342 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserUnitQuery; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportMaxReportCountQuery; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionDraftReport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionDraftReport.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String workId ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - Integer maxReportCount = null; - String report_progress = "CLOSE"; - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - //是否汇报工作的进展进度数字 - report_progress = okrConfigSystemService.getValueWithConfigCode( "REPORT_PROGRESS" ); - if( report_progress == null || report_progress.isEmpty() ){ - report_progress = "CLOSE"; - } - } catch (Exception e) { - report_progress = "CLOSE"; - logger.warn( "system get config got an exception." ); - logger.error(e); - } - } - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - //对wrapIn里的信息进行校验 - //先根据workId获取该工作汇报的草稿信息，如果有，则直接展示内容，如果没有则进行新建操作 - wrap = new Wo(); - //设置当前登录用户为创建工作汇报的用户 - wrap.setCreatorName( effectivePerson.getDistinguishedName() ); - if( check ){ - try { - wrap.setCreatorIdentity( okrUserManagerService.getIdentityWithPerson(effectivePerson.getDistinguishedName()) ); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - wrap.setCreatorUnitName( okrUserManagerService.getUnitNameByIdentity( wrap.getCreatorIdentity())); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, wrap.getCreatorIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - wrap.setCreatorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( wrap.getCreatorIdentity() )); - } catch ( Exception e ) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, wrap.getCreatorIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - //校验汇报者姓名 - wrap.setReporterName( okrUserCache.getLoginUserName() ); - wrap.setReporterIdentity( okrUserCache.getLoginIdentityName() ); - wrap.setReporterUnitName( okrUserCache.getLoginUserUnitName() ); - wrap.setReporterTopUnitName( okrUserCache.getLoginUserTopUnitName() ); - - List identityList = new ArrayList<>(); - ListnameList = new ArrayList<>(); - ListunitList = new ArrayList<>(); - ListtopUnitList = new ArrayList<>(); - - nameList.add( okrUserCache.getLoginUserName() ); - identityList.add( okrUserCache.getLoginIdentityName() ); - unitList.add( okrUserCache.getLoginUserUnitName() ); - topUnitList.add( okrUserCache.getLoginUserTopUnitName() ); - - wrap.setCurrentProcessorNameList( nameList ); - wrap.setCurrentProcessorIdentityList( identityList ); - wrap.setCurrentProcessorUnitNameList( unitList ); - wrap.setCurrentProcessorTopUnitNameList( topUnitList ); - } - //补充工作标题 - if( check ){ - try { - wrap.setWorkId( workId ); - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo != null ){ - wrap.setWorkType( okrWorkBaseInfo.getWorkType() ); - wrap.setWorkTitle( okrWorkBaseInfo.getTitle() ); - }else{ - check = false; - Exception exception = new ExceptionWorkNotExists( workId ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, workId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - //补充中心工作信息 - if( check ){ - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get( okrWorkBaseInfo.getCenterId() ); - if( okrCenterWorkInfo != null ){ - wrap.setCenterId( okrCenterWorkInfo.getId() ); - wrap.setCenterTitle( okrCenterWorkInfo.getTitle() ); - }else{ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - maxReportCount = okrWorkReportOperationService.getMaxReportCount( okrWorkBaseInfo.getId() ); - wrap.setReportCount( ( maxReportCount + 1 ) ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportMaxReportCountQuery( e, okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - //草稿|管理员督办|领导批示|已完成 - wrap.setProcessStatus( "草稿" ); - wrap.setStatus( "正常" ); - //根据已知信息组织汇报标题和汇简要标题 - wrap.setTitle( okrWorkBaseInfo.getTitle() ); - wrap.setShortTitle( "第" + wrap.getReportCount() + "次工作汇报" ); - } - wrap.setIsCreator(true); - wrap.setIsReporter(true); - - if( "OPEN".equals( report_progress )){ - wrap.setNeedReportProgress( true ); - }else{ - wrap.setNeedReportProgress( false ); - } - - result.setData( wrap ); - return result; - } - - public static class Wo extends OkrWorkReportBaseInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private Boolean isReporter = false; - - private Boolean isWorkAdmin = false; - - private Boolean isReadLeader = false; - - private Boolean isCreator = false; - - private Boolean needReportProgress = false; - - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private List processLogs = null; - - private WoOkrWorkBaseInfo workInfo = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Boolean getIsReporter() { - return isReporter; - } - - public void setIsReporter(Boolean isReporter) { - this.isReporter = isReporter; - } - - public Boolean getIsWorkAdmin() { - return isWorkAdmin; - } - - public void setIsWorkAdmin(Boolean isWorkAdmin) { - this.isWorkAdmin = isWorkAdmin; - } - - public Boolean getIsReadLeader() { - return isReadLeader; - } - - public void setIsReadLeader(Boolean isReadLeader) { - this.isReadLeader = isReadLeader; - } - - public Boolean getIsCreator() { - return isCreator; - } - - public void setIsCreator(Boolean isCreator) { - this.isCreator = isCreator; - } - - public String getProgressDescription() { - return progressDescription; - } - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - public String getWorkPlan() { - return workPlan; - } - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - public String getMemo() { - return memo; - } - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public List getProcessLogs() { - return processLogs; - } - - public void setProcessLogs(List processLogs) { - this.processLogs = processLogs; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public WoOkrWorkBaseInfo getWorkInfo() { - return workInfo; - } - - public void setWorkInfo(WoOkrWorkBaseInfo workInfo) { - this.workInfo = workInfo; - } - - public Boolean getNeedReportProgress() { - return needReportProgress; - } - - public void setNeedReportProgress(Boolean needReportProgress) { - this.needReportProgress = needReportProgress; - } - - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGet.java deleted file mode 100644 index 819c8e004b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGet.java +++ /dev/null @@ -1,362 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionReportProcessLogList; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionSystemConfigQueryByCode; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportWrapOut; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - List okrWorkReportProcessLogList = null; - String workAdminIdentity = null; - String report_progress = "CLOSE"; - List ids = null; - Boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - try { - //是否汇报工作的进展进度数字 - report_progress = okrConfigSystemService.getValueWithConfigCode( "REPORT_PROGRESS" ); - if( report_progress == null || report_progress.isEmpty() ){ - report_progress = "CLOSE"; - } - } catch (Exception e) { - report_progress = "CLOSE"; - logger.warn( "system get config got an exception." ); - logger.error(e); - } - } - - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error( exception ); - } - - if( check ){ - if ( okrUserCache.getLoginUserName() == null ) { - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - } - - if( check ){ - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( id ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - wrap = Wo.copier.copy( okrWorkReportBaseInfo ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrap.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrap.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - // 查询汇报详细信息 - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get( id ); - if( okrWorkReportDetailInfo != null ){ - wrap.setWorkPlan( okrWorkReportDetailInfo.getWorkPlan() ); - wrap.setWorkPointAndRequirements( okrWorkReportDetailInfo.getWorkPointAndRequirements() ); - wrap.setProgressDescription( okrWorkReportDetailInfo.getProgressDescription() ); - wrap.setAdminSuperviseInfo( okrWorkReportDetailInfo.getAdminSuperviseInfo() ); - } - } catch (Exception e) { - logger.warn( "system get okrWorkReportDetailInfo got an exception" ); - logger.error(e); - } - } - } - //查询所有的审批日志 - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - ids = okrWorkReportProcessLogService.listByReportId( id ); - if( ids !=null ){ - okrWorkReportProcessLogList = okrWorkReportProcessLogService.list( ids ); - if( okrWorkReportProcessLogList != null ){ - wrap.setProcessLogs( WoOkrWorkReportProcessLog.copier.copy( okrWorkReportProcessLogList ) ); - } - } - } catch (Exception e) { - Exception exception = new ExceptionReportProcessLogList( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - workAdminIdentity = okrConfigSystemService.getValueWithConfigCode( "REPORT_SUPERVISOR" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigQueryByCode( e, "REPORT_SUPERVISOR" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if( check ){ - //判断当前处理人是什么身份 - if( wrap.getCreatorIdentity() != null && okrUserCache.getLoginIdentityName() .equalsIgnoreCase( wrap.getCreatorIdentity())){ - wrap.setIsCreator( true ); - } - if( wrap.getReporterIdentity() != null && okrUserCache.getLoginIdentityName() .equalsIgnoreCase( wrap.getReporterIdentity())){ - wrap.setIsReporter(true); - } - if( "ADMIN_AND_ALLLEADER".equals( wrap.getReportWorkflowType() )){ - //从汇报审阅领导里进行比对 - if( ListTools.isNotEmpty( wrap.getReadLeadersIdentityList() ) && wrap.getReadLeadersIdentityList().contains( okrUserCache.getLoginIdentityName() ) ){ - wrap.setIsReadLeader( true ); - } - }else if( "DEPLOYER".equals( wrap.getReportWorkflowType() ) ){ - if( okrWorkBaseInfo != null ){ - //对比当前工作的部署者是否是当前用户 - if( okrWorkBaseInfo.getDeployerIdentity() != null && okrWorkBaseInfo.getDeployerIdentity().equalsIgnoreCase( okrUserCache.getLoginIdentityName() ) ){ - wrap.setIsReadLeader( true ); - } - } - } - - if( workAdminIdentity != null && !workAdminIdentity.isEmpty() && okrUserCache.getLoginIdentityName() .equalsIgnoreCase( workAdminIdentity )){ - wrap.setIsWorkAdmin( true ); - } - - String workDetail = okrWorkDetailInfoService.getWorkDetailWithId( wrap.getWorkId() ); - if( workDetail != null && !workDetail.isEmpty() ){ - wrap.setTitle( workDetail ); - } - if( "OPEN".equals( report_progress )){ - wrap.setNeedReportProgress( true ); - }else{ - wrap.setNeedReportProgress( false ); - } - result.setData(wrap); - } - return result; - } - - public static class Wo extends OkrWorkReportBaseInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkReportBaseInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Boolean isReporter = false; - - private Boolean isWorkAdmin = false; - - private Boolean isReadLeader = false; - - private Boolean isCreator = false; - - private Boolean needReportProgress = false; - - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private List processLogs = null; - - private WoOkrWorkBaseInfo workInfo = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Boolean getIsReporter() { - return isReporter; - } - - public void setIsReporter(Boolean isReporter) { - this.isReporter = isReporter; - } - - public Boolean getIsWorkAdmin() { - return isWorkAdmin; - } - - public void setIsWorkAdmin(Boolean isWorkAdmin) { - this.isWorkAdmin = isWorkAdmin; - } - - public Boolean getIsReadLeader() { - return isReadLeader; - } - - public void setIsReadLeader(Boolean isReadLeader) { - this.isReadLeader = isReadLeader; - } - - public Boolean getIsCreator() { - return isCreator; - } - - public void setIsCreator(Boolean isCreator) { - this.isCreator = isCreator; - } - - public String getProgressDescription() { - return progressDescription; - } - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - public String getWorkPlan() { - return workPlan; - } - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - public String getMemo() { - return memo; - } - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public List getProcessLogs() { - return processLogs; - } - - public void setProcessLogs(List processLogs) { - this.processLogs = processLogs; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public WoOkrWorkBaseInfo getWorkInfo() { - return workInfo; - } - - public void setWorkInfo(WoOkrWorkBaseInfo workInfo) { - this.workInfo = workInfo; - } - - public Boolean getNeedReportProgress() { - return needReportProgress; - } - - public void setNeedReportProgress(Boolean needReportProgress) { - this.needReportProgress = needReportProgress; - } - - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGetFullInfo.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGetFullInfo.java deleted file mode 100644 index a569d66d36..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionGetFullInfo.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportWrapOut; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ActionGetFullInfo extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGetFullInfo.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - WoOkrWorkReportBaseInfo wrap = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - List okrWorkReportProcessLogList = null; - List ids = null; - Boolean check = true; - - if( check ){ - if( id == null || id.isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error( exception ); - } - } - if( check ){ - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( id ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - wrap = WoOkrWorkReportBaseInfo.copier.copy( okrWorkReportBaseInfo ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if( check ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrap.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrap.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrap.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get( id ); - if( okrWorkReportDetailInfo != null ){ - wrap.setWorkPlan( okrWorkReportDetailInfo.getWorkPlan() ); - wrap.setWorkPointAndRequirements( okrWorkReportDetailInfo.getWorkPointAndRequirements() ); - wrap.setProgressDescription( okrWorkReportDetailInfo.getProgressDescription() ); - wrap.setAdminSuperviseInfo( okrWorkReportDetailInfo.getAdminSuperviseInfo() ); - } - } catch (Exception e) { - logger.warn( "system get okrWorkReportDetailInfo got an exception" ); - logger.error(e); - } - } - } - if( check ){ - if( okrWorkReportBaseInfo != null ){ - try { - ids = okrWorkReportProcessLogService.listByReportId( id ); - if( ids !=null ){ - okrWorkReportProcessLogList = okrWorkReportProcessLogService.list( ids ); - if( okrWorkReportProcessLogList != null ){ - wrap.setProcessLogs( WoOkrWorkReportProcessLog.copier.copy( okrWorkReportProcessLogList ) ); - } - } - } catch (Exception e) { - logger.warn( "system get okrWorkReportDetailInfo got an exception." ); - logger.error(e); - } - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListByWork.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListByWork.java deleted file mode 100644 index 903ad2c14d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListByWork.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionReportProcessLogList; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportDetailQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportListByWorkId; -import com.x.okr.assemble.control.service.OkrWorkReportDetailInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportProcessLogService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ActionListByWork extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListByWork.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String workId ) throws Exception { - ActionResult> result = new ActionResult>(); - OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - OkrWorkReportDetailInfoService okrWorkReportDetailInfoService = new OkrWorkReportDetailInfoService(); - OkrWorkReportProcessLogService okrWorkReportProcessLogService = new OkrWorkReportProcessLogService(); - List wraps = null; - List okrWorkReportBaseInfoList = null; - List okrWorkReportProcessLogList = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - List ids = null; - List logsIds = null; - - if ( workId == null || workId.isEmpty() ) { - Exception exception = new ExceptionWorkIdEmpty(); - result.error(exception); - } else { - try { - ids = okrWorkReportQueryService.listByWorkId(workId); - if (ids != null && !ids.isEmpty()) { - okrWorkReportBaseInfoList = okrWorkReportQueryService.listByIds(ids); - if (okrWorkReportBaseInfoList != null && !okrWorkReportBaseInfoList.isEmpty()) { - wraps = WoOkrWorkReportBaseInfo.copier.copy(okrWorkReportBaseInfoList); - for (WoOkrWorkReportBaseInfo wrap : wraps) { - try { - logsIds = okrWorkReportProcessLogService.listByReportId(wrap.getId()); - if (logsIds != null) { - okrWorkReportProcessLogList = okrWorkReportProcessLogService.list(logsIds); - if ( okrWorkReportProcessLogList != null ) { - wrap.setProcessLogs( WoOkrWorkReportProcessLog.copier.copy(okrWorkReportProcessLogList)); - } - } - } catch (Exception e) { - Exception exception = new ExceptionReportProcessLogList(e, wrap.getId()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get(wrap.getId()); - if (okrWorkReportDetailInfo != null) { - wrap.setWorkPlan(okrWorkReportDetailInfo.getWorkPlan()); - wrap.setWorkPointAndRequirements( - okrWorkReportDetailInfo.getWorkPointAndRequirements()); - wrap.setProgressDescription(okrWorkReportDetailInfo.getProgressDescription()); - } - } catch (Exception e) { - Exception exception = new ExceptionWorkReportDetailQueryById(e, wrap.getId()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - String workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - SortTools.asc(wraps, "reportCount"); - result.setData(wraps); - } - } - } catch (Exception e) { - Exception exception = new ExceptionWorkReportListByWorkId(e, workId); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftNextWithFilter.java deleted file mode 100644 index c20b2066f3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftNextWithFilter.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionListDraftNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListDraftNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - List wraps = null; - List okrWorkReportBaseInfoList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - WrapInFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, WrapInFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (wrapIn == null) { - wrapIn = new WrapInFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (check) { - wrapIn.addQueryInfoStatus("正常"); - wrapIn.addQueryProcessStatus("草稿"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportBaseInfoList = okrWorkReportQueryService.listNextWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportQueryService.getCountWithFilter(wrapIn); - wraps = WoOkrWorkReportBaseInfo.copier.copy(okrWorkReportBaseInfoList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (WoOkrWorkReportBaseInfo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftPrevWithFilter.java deleted file mode 100644 index ae07844b5a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListDraftPrevWithFilter.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionListDraftPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListDraftPrevWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - List wraps = null; - List okrWorkReportBaseInfoList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - WrapInFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, WrapInFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (wrapIn == null) { - wrapIn = new WrapInFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (check) { - wrapIn.addQueryInfoStatus("正常"); - wrapIn.addQueryProcessStatus("草稿"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportBaseInfoList = okrWorkReportQueryService.listNextWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportQueryService.getCountWithFilter(wrapIn); - wraps = WoOkrWorkReportBaseInfo.copier.copy(okrWorkReportBaseInfoList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (WoOkrWorkReportBaseInfo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchiveNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchiveNextWithFilter.java deleted file mode 100644 index da6f29ecf3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchiveNextWithFilter.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionListMyArchiveNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyArchiveNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - List wraps = null; - List okrWorkReportPersonLinkList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (wrapIn == null) { - wrapIn = new com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (check) { - wrapIn.addQueryInfoStatus("已归档"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportPersonLinkList = okrWorkReportPersonLinkService.listNextWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportPersonLinkService.getCountWithFilter(wrapIn); - wraps = Wo.copier.copy(okrWorkReportPersonLinkList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (Wo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } - - public static class Wo extends OkrWorkReportPersonLink{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchivePrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchivePrevWithFilter.java deleted file mode 100644 index 724a9d7fc8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyArchivePrevWithFilter.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionListMyArchivePrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyArchivePrevWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - List wraps = null; - List okrWorkReportPersonLinkList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (wrapIn == null) { - wrapIn = new com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (check) { - wrapIn.addQueryInfoStatus("已归档"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportPersonLinkList = okrWorkReportPersonLinkService.listPrevWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportPersonLinkService.getCountWithFilter(wrapIn); - wraps = Wo.copier.copy(okrWorkReportPersonLinkList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (Wo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } - - public static class Wo extends OkrWorkReportPersonLink{ - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessNextWithFilter.java deleted file mode 100644 index 45ad7b6bc6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessNextWithFilter.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionListMyProcessNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyProcessNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - List wraps = null; - List okrWorkReportPersonLinkList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (wrapIn == null) { - wrapIn = new com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (check) { - wrapIn.addQueryInfoStatus("正常"); - // 待处理|处理中|已处理 - wrapIn.addQueryProcessStatus("已处理"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportPersonLinkList = okrWorkReportPersonLinkService.listNextWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportPersonLinkService.getCountWithFilter(wrapIn); - wraps = Wo.copier.copy(okrWorkReportPersonLinkList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (Wo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } - - public static class Wo extends OkrWorkReportPersonLink{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessPrevWithFilter.java deleted file mode 100644 index 2f27301c6d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyProcessPrevWithFilter.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionListMyProcessPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyProcessPrevWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - List wraps = null; - List okrWorkReportPersonLinkList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (wrapIn == null) { - wrapIn = new com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, currentPerson, request, null); - } - - if (check) { - wrapIn.addQueryInfoStatus("正常"); - // 待处理|处理中|已处理 - wrapIn.addQueryProcessStatus("已处理"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportPersonLinkList = okrWorkReportPersonLinkService.listPrevWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportPersonLinkService.getCountWithFilter(wrapIn); - wraps = Wo.copier.copy(okrWorkReportPersonLinkList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (Wo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - return result; - } - - public static class Wo extends OkrWorkReportPersonLink{ - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskNextWithFilter.java deleted file mode 100644 index 23a8f0b4bc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskNextWithFilter.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionListMyTaskNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionListMyTaskNextWithFilter.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - - List wraps = null; - List okrWorkReportPersonLinkList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - } - - if (wrapIn == null) { - wrapIn = new com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - } - - if (check) { - wrapIn.addQueryInfoStatus("正常"); - // 待处理|处理中|已处理 - wrapIn.addQueryProcessStatus("处理中"); - wrapIn.addQueryProcessStatus("待处理"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportPersonLinkList = okrWorkReportPersonLinkService.listNextWithFilter( id, count, wrapIn ); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportPersonLinkService.getCountWithFilter(wrapIn); - wraps = Wo.copier.copy( okrWorkReportPersonLinkList ); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (Wo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - - return result; - } - - public static class Wo extends OkrWorkReportPersonLink{ - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskPrevWithFilter.java deleted file mode 100644 index 15dc697573..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListMyTaskPrevWithFilter.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionListMyTaskPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListMyTaskPrevWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - - List wraps = null; - List okrWorkReportPersonLinkList = null; - Long total = 0L; - EffectivePerson currentPerson = this.effectivePerson(request); - OkrUserCache okrUserCache = null; - com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(currentPerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionGetOkrUserCache(e, currentPerson.getDistinguishedName()); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } - if (check && okrUserCache == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - } - - if (wrapIn == null) { - wrapIn = new com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter(); - } - - if (check && okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new ExceptionUserNoLogin(currentPerson.getDistinguishedName()); - result.error(exception); - } - - if (check) { - wrapIn.addQueryInfoStatus("正常"); - // 待处理|处理中|已处理 - wrapIn.addQueryProcessStatus("处理中"); - wrapIn.setProcessIdentity(okrUserCache.getLoginIdentityName()); - } - if (check) { - try { - okrWorkReportPersonLinkList = okrWorkReportPersonLinkService.listPrevWithFilter(id, count, wrapIn); - // 从数据库中查询符合条件的对象总数 - total = okrWorkReportPersonLinkService.getCountWithFilter(wrapIn); - wraps = Wo.copier.copy(okrWorkReportPersonLinkList); - String workDetail = null; - if (wraps != null && !wraps.isEmpty()) { - for (Wo wrap : wraps) { - workDetail = okrWorkDetailInfoService.getWorkDetailWithId(wrap.getWorkId()); - if (workDetail != null && !workDetail.isEmpty()) { - wrap.setTitle(workDetail); - } - } - } - result.setCount(total); - result.setData(wraps); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, currentPerson, request, null); - } - } else { - result.setCount(0L); - result.setData(new ArrayList()); - } - - return result; - } - - public static class Wo extends OkrWorkReportPersonLink { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListNextWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListNextWithFilter.java deleted file mode 100644 index ec9b064cad..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListNextWithFilter.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionListNextWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - if (check) { - if (wrapIn == null) { - wrapIn = new Wi(); - } - } - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("title", wrapIn.getFilterLikeContent()); - likesMap.put("creatorIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("currentProcessorIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("description", wrapIn.getFilterLikeContent()); - likesMap.put("processStatus", wrapIn.getFilterLikeContent()); - likesMap.put("reporterIdentity", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListNext(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, false, wrapIn.getOrder()); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - } - - public static class Wo extends OkrWorkReportBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportBaseInfo.class, - Wo.class, null, Wo.Excludes); - - private Boolean isReporter = false; - - private Boolean isWorkAdmin = false; - - private Boolean isReadLeader = false; - - private Boolean isCreator = false; - - private Boolean needReportProgress = false; - - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private List processLogs = null; - - private WoOkrWorkBaseInfo workInfo = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Boolean getIsReporter() { - return isReporter; - } - - public void setIsReporter(Boolean isReporter) { - this.isReporter = isReporter; - } - - public Boolean getIsWorkAdmin() { - return isWorkAdmin; - } - - public void setIsWorkAdmin(Boolean isWorkAdmin) { - this.isWorkAdmin = isWorkAdmin; - } - - public Boolean getIsReadLeader() { - return isReadLeader; - } - - public void setIsReadLeader(Boolean isReadLeader) { - this.isReadLeader = isReadLeader; - } - - public Boolean getIsCreator() { - return isCreator; - } - - public void setIsCreator(Boolean isCreator) { - this.isCreator = isCreator; - } - - public String getProgressDescription() { - return progressDescription; - } - - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - - public String getWorkPlan() { - return workPlan; - } - - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public List getProcessLogs() { - return processLogs; - } - - public void setProcessLogs(List processLogs) { - this.processLogs = processLogs; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public WoOkrWorkBaseInfo getWorkInfo() { - return workInfo; - } - - public void setWorkInfo(WoOkrWorkBaseInfo workInfo) { - this.workInfo = workInfo; - } - - public Boolean getNeedReportProgress() { - return needReportProgress; - } - - public void setNeedReportProgress(Boolean needReportProgress) { - this.needReportProgress = needReportProgress; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListPrevWithFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListPrevWithFilter.java deleted file mode 100644 index 8b10a0ab3a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionListPrevWithFilter.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.EqualsTerms; -import com.x.base.core.project.jaxrs.InTerms; -import com.x.base.core.project.jaxrs.LikeTerms; -import com.x.base.core.project.jaxrs.MemberTerms; -import com.x.base.core.project.jaxrs.NotEqualsTerms; -import com.x.base.core.project.jaxrs.NotInTerms; -import com.x.base.core.project.jaxrs.NotMemberTerms; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportFilter; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionListPrevWithFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionListPrevWithFilter.class); - - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { - ActionResult> result = new ActionResult<>(); - String sequenceField = null; - EqualsTerms equalsMap = new EqualsTerms(); - NotEqualsTerms notEqualsMap = new NotEqualsTerms(); - InTerms insMap = new InTerms(); - NotInTerms notInsMap = new NotInTerms(); - MemberTerms membersMap = new MemberTerms(); - NotMemberTerms notMembersMap = new NotMemberTerms(); - LikeTerms likesMap = new LikeTerms(); - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, Wi.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - if (check) { - if (wrapIn == null) { - wrapIn = new Wi(); - } - } - if (check) { - if (wrapIn.getFilterLikeContent() != null && !wrapIn.getFilterLikeContent().isEmpty()) { - likesMap.put("title", wrapIn.getFilterLikeContent()); - likesMap.put("creatorIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("currentProcessorIdentity", wrapIn.getFilterLikeContent()); - likesMap.put("description", wrapIn.getFilterLikeContent()); - likesMap.put("processStatus", wrapIn.getFilterLikeContent()); - likesMap.put("reporterIdentity", wrapIn.getFilterLikeContent()); - } - } - if (check) { - sequenceField = wrapIn.getSequenceField(); - try { - result = this.standardListPrev(Wo.copier, id, count, sequenceField, equalsMap, notEqualsMap, likesMap, - insMap, notInsMap, membersMap, notMembersMap, null, false, wrapIn.getOrder()); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportFilter(e); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends GsonPropertyObject { - - @FieldDescribe("用于模糊查询的字符串.") - private String filterLikeContent = null; - - @FieldDescribe("用于列表排序的属性.") - private String sequenceField = JpaObject.sequence_FIELDNAME; - - @FieldDescribe("用于列表排序的方式.") - private String order = "DESC"; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public String getFilterLikeContent() { - return filterLikeContent; - } - - public void setFilterLikeContent(String filterLikeContent) { - this.filterLikeContent = filterLikeContent; - } - } - - public static class Wo extends OkrWorkReportBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo(OkrWorkReportBaseInfo.class, - Wo.class, null, Wo.Excludes); - - private Boolean isReporter = false; - - private Boolean isWorkAdmin = false; - - private Boolean isReadLeader = false; - - private Boolean isCreator = false; - - private Boolean needReportProgress = false; - - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private List processLogs = null; - - private WoOkrWorkBaseInfo workInfo = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Boolean getIsReporter() { - return isReporter; - } - - public void setIsReporter(Boolean isReporter) { - this.isReporter = isReporter; - } - - public Boolean getIsWorkAdmin() { - return isWorkAdmin; - } - - public void setIsWorkAdmin(Boolean isWorkAdmin) { - this.isWorkAdmin = isWorkAdmin; - } - - public Boolean getIsReadLeader() { - return isReadLeader; - } - - public void setIsReadLeader(Boolean isReadLeader) { - this.isReadLeader = isReadLeader; - } - - public Boolean getIsCreator() { - return isCreator; - } - - public void setIsCreator(Boolean isCreator) { - this.isCreator = isCreator; - } - - public String getProgressDescription() { - return progressDescription; - } - - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - - public String getWorkPlan() { - return workPlan; - } - - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public List getProcessLogs() { - return processLogs; - } - - public void setProcessLogs(List processLogs) { - this.processLogs = processLogs; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public WoOkrWorkBaseInfo getWorkInfo() { - return workInfo; - } - - public void setWorkInfo(WoOkrWorkBaseInfo workInfo) { - this.workInfo = workInfo; - } - - public Boolean getNeedReportProgress() { - return needReportProgress; - } - - public void setNeedReportProgress(Boolean needReportProgress) { - this.needReportProgress = needReportProgress; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSave.java deleted file mode 100644 index ff4167679d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSave.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionSystemConfigQueryByCode; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, WiOkrWorkReportBaseInfo wrapIn ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = new OkrWorkBaseInfo (); - String workAdminIdentity = null; - boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - if( check && wrapIn == null ){ - check = false; - result.error( new Exception( "保存汇报信息时未获取到工作ID，无法继续保存汇报信息!" ) ); - } - - if( check ){ - try { - workAdminIdentity = okrConfigSystemService.getValueWithConfigCode( "REPORT_SUPERVISOR" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigQueryByCode( e, "REPORT_SUPERVISOR" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( wrapIn.getWorkId() != null && !wrapIn.getWorkId().isEmpty() ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getWorkId() ); - if( okrWorkBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - } - //对wrapIn里的信息进行校验 - //查询汇报是否存在，如果存在，则不需要再新建一个了，直接更新 - if( check && wrapIn.getId() != null && !wrapIn.getId().isEmpty() ){ - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( wrapIn.getId() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, wrapIn.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrWorkReportBaseInfo == null || "草稿".equals( okrWorkReportBaseInfo.getActivityName() )){ - result = new ActionSaveDraftReport().execute( request, effectivePerson, workAdminIdentity, wrapIn ); - }else if( "管理员督办".equals( okrWorkReportBaseInfo.getActivityName() )){ - //管理员填写督办信息 - wrapIn.setId( okrWorkReportBaseInfo.getId() ); - wrapIn.setTitle( okrWorkReportBaseInfo.getTitle() ); - result = new ActionSaveAdminSupervise().execute( request, effectivePerson, okrWorkReportBaseInfo.getId(), wrapIn.getAdminSuperviseInfo() ); - }else{ - //领导阅知 - wrapIn.setId( okrWorkReportBaseInfo.getId() ); - wrapIn.setTitle( okrWorkReportBaseInfo.getTitle() ); - result = new ActionSaveLeaderOpinion().execute( request, effectivePerson, wrapIn, okrUserCache.getLoginIdentityName() ); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveAdminSupervise.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveAdminSupervise.java deleted file mode 100644 index 5a575ee082..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveAdminSupervise.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionAdminSuperviseInfoEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionAdminSuperviseSave; - -public class ActionSaveAdminSupervise extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSaveAdminSupervise.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String reportId, String adminSuperviseInfo ) throws Exception { - ActionResult result = new ActionResult<>(); - boolean check = true; - - //校验工作ID是否存在 - if( adminSuperviseInfo == null || adminSuperviseInfo.isEmpty() ){ - check = false; - Exception exception = new ExceptionAdminSuperviseInfoEmpty(); - result.error( exception ); - } - - if( check ){ - try { - okrWorkReportOperationService.saveAdminSuperviseInfo( reportId, adminSuperviseInfo ); - result.setData( new Wo( reportId )); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionAdminSuperviseSave( e, reportId ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveDraftReport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveDraftReport.java deleted file mode 100644 index 4a31cf24e8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveDraftReport.java +++ /dev/null @@ -1,248 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionSystemConfigQueryByCode; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserUnitQuery; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportMaxReportCountQuery; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportSave; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSaveDraftReport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSaveDraftReport.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String workAdminIdentity, WiOkrWorkReportBaseInfo wrapIn ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - Integer maxReportCount = null; - List ids = null; - Boolean check = true; - String report_auto_over = "CLOSE"; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - //校验工作ID是否存在 - if( wrapIn.getWorkId() == null || wrapIn.getWorkId().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - } - - //设置当前登录用户为创建工作汇报的用户 - if( Boolean.TRUE.equals( check ) ){ - try { - wrapIn.setCreatorName( effectivePerson.getDistinguishedName() ); - wrapIn.setCreatorIdentity( okrUserManagerService.getIdentityWithPerson(effectivePerson.getDistinguishedName()) ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( Boolean.TRUE.equals( check ) ){ - try { - wrapIn.setCreatorUnitName( okrUserManagerService.getUnitNameByIdentity(wrapIn.getCreatorIdentity())); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, wrapIn.getCreatorIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( Boolean.TRUE.equals( check ) ){ - try { - wrapIn.setCreatorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(wrapIn.getCreatorIdentity()) ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, wrapIn.getCreatorIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - //补充工作相关信息标题 - if( check ){ - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( wrapIn.getWorkId() ); - if( okrWorkBaseInfo != null ){ - wrapIn.setWorkType( okrWorkBaseInfo.getWorkType() ); - wrapIn.setWorkTitle( okrWorkBaseInfo.getTitle() ); - }else{ - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - //补充中心工作相关信息 - if( check ){ - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get( okrWorkBaseInfo.getCenterId() ); - if( okrCenterWorkInfo != null ){ - wrapIn.setCenterId( okrCenterWorkInfo.getId() ); - wrapIn.setCenterTitle( okrCenterWorkInfo.getTitle() ); - }else{ - check = false; - Exception exception = new ExceptionCenterWorkNotExists( okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - //补充汇报人信息 - if( check ){ - //校验汇报者姓名 - wrapIn.setReporterName( okrUserCache.getLoginUserName() ); - wrapIn.setReporterIdentity( okrUserCache.getLoginIdentityName() ); - wrapIn.setReporterUnitName( okrUserCache.getLoginUserUnitName() ); - wrapIn.setReporterTopUnitName( okrUserCache.getLoginUserTopUnitName() ); - List names = new ArrayList<>(); - List identities = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - names.add( okrUserCache.getLoginUserName() ); - identities.add( okrUserCache.getLoginIdentityName() ); - unitNames.add( okrUserCache.getLoginUserUnitName() ); - topUnitNames.add( okrUserCache.getLoginUserTopUnitName() ); - wrapIn.setCurrentProcessorNameList( names ); - wrapIn.setCurrentProcessorIdentityList( identities ); - wrapIn.setCurrentProcessorUnitNameList( unitNames ); - wrapIn.setCurrentProcessorTopUnitNameList( topUnitNames ); - } - //补充状态信息 - if( check ){ - //草稿|管理员督办|领导批示|已完成 - wrapIn.setProcessStatus( "草稿" ); - wrapIn.setStatus( "正常" ); - } - if( check ){ - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( wrapIn.getId() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, okrWorkBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrWorkReportBaseInfo == null ){ - //如果是保存新的草稿，那么补充汇报标题以及汇报次数信息 - if( wrapIn.getReportCount() == null || wrapIn.getReportCount() == 0 ){ - try { - maxReportCount = okrWorkReportOperationService.getMaxReportCount( okrWorkBaseInfo.getId() ); - wrapIn.setReportCount( ( maxReportCount + 1 ) ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportMaxReportCountQuery( e, okrWorkBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( wrapIn.getTitle() == null || wrapIn.getTitle().isEmpty() ){ - //根据已知信息组织汇报标题和汇简要标题 - wrapIn.setTitle( okrWorkBaseInfo.getTitle() ); - wrapIn.setShortTitle( "第" + wrapIn.getReportCount() + "次工作汇报" ); - } - - //草稿|管理员督办|领导批示|已完成 - wrapIn.setProcessStatus( "草稿" ); - wrapIn.setStatus( "正常" ); - }else{ - wrapIn.setReportCount( okrWorkReportBaseInfo.getReportCount() ); - wrapIn.setTitle( okrWorkReportBaseInfo.getTitle() ); - wrapIn.setShortTitle( okrWorkReportBaseInfo.getShortTitle() ); - wrapIn.setProcessStatus( okrWorkReportBaseInfo.getProcessStatus() ); - wrapIn.setStatus( okrWorkReportBaseInfo.getStatus() ); - } - } - - if( check ){ - try { - report_auto_over = okrConfigSystemService.getValueWithConfigCode( "REPORT_AUTO_OVER" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigQueryByCode( e, "REPORT_AUTO_OVER" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( report_auto_over != null && "OPEN".equals( report_auto_over )){ - //根据配置查询该工作所有正在流转中的工作汇报ID列表,包括草稿 - try { - ids = okrWorkReportQueryService.listProcessingReportIdsByWorkId( okrWorkBaseInfo.getId() ); - if (ids != null && !ids.isEmpty() ) { - for ( String id : ids ) { - if( wrapIn != null && wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - if( !id.equals( wrapIn.getId() )){ - okrWorkReportFlowService.dispatchToOver(id); - } - } - } - } - } catch (Exception e) { - logger.warn( "system dispatch processing report to over got an exception." ); - logger.error(e); - } - } - try { - okrWorkReportBaseInfo = okrWorkReportOperationService.save( wrapIn, wrapIn.getWorkPointAndRequirements(), - wrapIn.getProgressDescription(), wrapIn.getWorkPlan(), wrapIn.getAdminSuperviseInfo(), wrapIn.getMemo(), wrapIn.getOpinion() ); - result.setData( new Wo( okrWorkReportBaseInfo.getId() )); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveLeaderOpinion.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveLeaderOpinion.java deleted file mode 100644 index 740247e5d4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveLeaderOpinion.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionLeaderOpinionEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionLeaderOpinionSave; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSaveLeaderOpinion extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSaveLeaderOpinion.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, WiOkrWorkReportBaseInfo wrapIn, String processorIdentity ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - boolean check = true; - - if( check ){ - //校验工作ID是否存在 - if( wrapIn.getOpinion() == null || wrapIn.getOpinion().isEmpty() ){ - check = false; - Exception exception = new ExceptionLeaderOpinionEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( wrapIn.getId() == null || wrapIn.getId().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try{ - okrWorkReportBaseInfo = okrWorkReportQueryService.get( wrapIn.getId() ); - if( okrWorkReportBaseInfo == null ){ - check = false; - Exception exception = new ExceptionWorkReportNotExists( wrapIn.getId() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - }catch( Exception e ){ - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, wrapIn.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrWorkReportOperationService.saveLeaderOpinionInfo( okrWorkReportBaseInfo, wrapIn.getOpinion(), processorIdentity ); - result.setData( new Wo( okrWorkReportBaseInfo.getId() )); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionLeaderOpinionSave( e, wrapIn.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmit.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmit.java deleted file mode 100644 index 56f6bf13bb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmit.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportAdminProcess; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportDraftSubmit; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportLeaderSubmit; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportSave; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSubmit extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSubmit.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - Boolean check = true; - List ids = null; - OkrUserCache okrUserCache = null; - WiOkrWorkReportBaseInfo wrapIn = null; - - if( check ){ - try { - wrapIn = this.convertToWrapIn( jsonElement, WiOkrWorkReportBaseInfo.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - if( wrapIn.getId() == null || wrapIn.getId().isEmpty() ){ - check = false; - Exception exception = new ExceptionWorkReportIdEmpty(); - result.error( exception ); - } - } - - //查询汇报是否存在，如果存在，则不需要再新建一个了，直接更新 - if( check ){ - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( wrapIn.getId() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, wrapIn.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( okrWorkReportBaseInfo == null ){ - try { - logger.info( "report not exists yet, save a new report......" ); - result = new ActionSave().execute( request, effectivePerson, wrapIn ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - //判断当前用户身份在指定的工作汇报中是否存在待办信息，是否需要进行处理 - ids = okrTaskService.listIdsByTargetActivityAndObjId( "工作汇报", wrapIn.getId(), null, okrUserCache.getLoginIdentityName() ); - if( ids == null || ids.isEmpty() ){ - check = false; - logger.warn( "user has no task, user need not process this report." ); - } - } - - if( check ){ - if( okrWorkReportBaseInfo == null || "草稿".equals( okrWorkReportBaseInfo.getActivityName() )){ - try { - wrapIn.setCurrentProcessLevel( 1 ); - result = new ActionSubmitDraftReport().execute( request, effectivePerson, wrapIn ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportDraftSubmit( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else if( okrWorkReportBaseInfo != null && "管理员督办".equals( okrWorkReportBaseInfo.getActivityName() )){ - //管理员填写督办信息 - try { - okrWorkReportBaseInfo.setIsWorkCompleted( wrapIn.getIsWorkCompleted() ); - okrWorkReportBaseInfo.setProgressPercent( wrapIn.getProgressPercent() ); - result = new ActionSubmitAdminSupervise().execute( request, effectivePerson, okrWorkReportBaseInfo, wrapIn.getAdminSuperviseInfo() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportAdminProcess( e, okrWorkReportBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else if( okrWorkReportBaseInfo != null){ - //领导审批 - try { - result = new ActionSubmitLeaderOpinion().execute( request, effectivePerson, okrWorkReportBaseInfo, wrapIn.getOpinion() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportLeaderSubmit( e, okrWorkReportBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - - if( check ){ - List workTypeList = new ArrayList(); - if( okrWorkReportBaseInfo != null ){ - workTypeList.add( okrWorkReportBaseInfo.getWorkType() ); - }else{ - workTypeList = okrConfigWorkTypeService.listAllTypeName(); - } - try { - okrWorkReportTaskCollectService.checkReportCollectTask( okrUserCache.getLoginIdentityName(), workTypeList ); - } catch (Exception e) { - logger.warn( "check report collect got an exception ." ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitAdminSupervise.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitAdminSupervise.java deleted file mode 100644 index b484d6da35..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitAdminSupervise.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportAdminProcess; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSubmitAdminSupervise extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSubmitAdminSupervise.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, OkrWorkReportBaseInfo okrWorkReportBaseInfo, String adminSuperviseInfo ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - OkrUserCache okrUserCache = null; - String report_progress = "CLOSE"; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - - if ( check ) { - if( adminSuperviseInfo == null || adminSuperviseInfo.isEmpty() ){ - adminSuperviseInfo = "无"; - } - } - if( check ){//处理管理员提交过程 - try { - okrWorkReportFlowService.adminProcess( okrWorkReportBaseInfo, adminSuperviseInfo, okrUserCache.getLoginIdentityName() ); - result.setData( new Wo( okrWorkReportBaseInfo.getId() ) ); - } catch (Exception e) { - Exception exception = new ExceptionWorkReportAdminProcess( e, okrWorkReportBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try {//是否汇报工作的进展进度数字 - report_progress = okrConfigSystemService.getValueWithConfigCode( "REPORT_PROGRESS" ); - if( report_progress == null || report_progress.isEmpty() ){ - report_progress = "CLOSE"; - } - } catch (Exception e) { - report_progress = "CLOSE"; - logger.warn( "system get config got an exception." ); - logger.error(e); - } - } - if( check ){ - try {//分析该工作的进展情况 - okrWorkBaseInfoService.analyseWorkProgress( okrWorkReportBaseInfo.getWorkId(), okrWorkReportBaseInfo, report_progress, dateOperation.getNowDateTime() ); - } catch (Exception e ) { - logger.warn( "system analyse work progres got an exceptin.", e ); - result.error( e ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ) { - //发送待阅信息 - //管理员督办信息提交后，看看汇报是否已经流转完成，如果已经流转完成，那么需要向负责人和所有的授权人 - if( okrWorkReportBaseInfo != null ) { - if( "已完成".equals( okrWorkReportBaseInfo.getProcessStatus() )){ - //1、向汇报人发送待阅信息 - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkReportBaseInfo.getReporterIdentity() ); - //2、向该工作所有的授权人发送待阅信息 - List authorize_ids = okrWorkAuthorizeRecordService.listByWorkId( okrWorkReportBaseInfo.getWorkId() ); - if( authorize_ids != null ){ - for( String authorize_id : authorize_ids ){ - //logger.info( "工作的授权信息ID:" + authorize_id ); - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.get( authorize_id ); - if( okrWorkAuthorizeRecord != null ){ - //logger.info( "工作的授权人:" + okrWorkAuthorizeRecord.getDelegatorIdentity() ); - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkAuthorizeRecord.getDelegatorIdentity() ); - } - } - } - } - } - } - - if( check ) { - //记录工作动态信息 - if( okrWorkReportBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkReport( okrWorkReportBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "提交工作汇报", - "工作汇报流转[督办员]提交成功！" - ); - -// if(ListTools.isNotEmpty( okrWorkReportBaseInfo.getCurrentProcessorNameList())) { -// for( String name : okrWorkReportBaseInfo.getCurrentProcessorNameList() ) { -// SmsMessageOperator.send( name, "工作汇报'"+okrWorkReportBaseInfo.getTitle()+"'已经提交，请审批！"); -// } -// } - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitDraftReport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitDraftReport.java deleted file mode 100644 index 526b06a0e2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitDraftReport.java +++ /dev/null @@ -1,265 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.dataadapter.webservice.sms.SmsMessageOperator; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionCenterWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionCenterWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserUnitQuery; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportMaxReportCountQuery; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportQueryById; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWorkReportSubmit; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSubmitDraftReport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSubmitDraftReport.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, WiOkrWorkReportBaseInfo wrapIn ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - Integer maxReportCount = null; - String report_progress = null; - boolean check = true; - OkrUserCache okrUserCache = null; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - - // 对wrapIn里的信息进行校验 - // 校验工作ID是否存在 - if ( wrapIn.getWorkId() == null || wrapIn.getWorkId().isEmpty() ) { - check = false; - Exception exception = new ExceptionWorkIdEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - - // 设置当前登录用户为创建工作汇报的用户 - if (check) { - try { - wrapIn.setCreatorName(effectivePerson.getDistinguishedName()); - wrapIn.setCreatorIdentity(okrUserManagerService.getIdentityWithPerson(effectivePerson.getDistinguishedName())); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if (check) { - try { - wrapIn.setCreatorUnitName( okrUserManagerService.getUnitNameByIdentity(wrapIn.getCreatorIdentity())); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, wrapIn.getCreatorIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if (check) { - try { - wrapIn.setCreatorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(wrapIn.getCreatorIdentity())); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionUserUnitQuery( e, wrapIn.getCreatorIdentity() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - // 补充工作相关信息标题 - if (check) { - try { - wrapIn.setWorkId( wrapIn.getWorkId() ); - okrWorkBaseInfo = okrWorkBaseInfoService.get(wrapIn.getWorkId()); - if (okrWorkBaseInfo != null) { - wrapIn.setWorkTitle(okrWorkBaseInfo.getTitle()); - } else { - check = false; - Exception exception = new ExceptionWorkNotExists( wrapIn.getWorkId() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkQueryById( e, wrapIn.getWorkId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - // 补充中心工作相关信息 - if (check) { - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get( okrWorkBaseInfo.getCenterId() ); - if (okrCenterWorkInfo != null) { - wrapIn.setCenterId(okrCenterWorkInfo.getId()); - wrapIn.setCenterTitle(okrCenterWorkInfo.getTitle()); - } else { - check = false; - Exception exception = new ExceptionCenterWorkNotExists( okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } catch (Exception e) { - check = false; - Exception exception = new ExceptionCenterWorkQueryById( e, okrWorkBaseInfo.getCenterId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - // 补充汇报人信息 - if (check) { - // 校验汇报者姓名 - wrapIn.setReporterName(okrUserCache.getLoginUserName()); - wrapIn.setReporterIdentity(okrUserCache.getLoginIdentityName() ); - wrapIn.setReporterUnitName(okrUserCache.getLoginUserUnitName()); - wrapIn.setReporterTopUnitName(okrUserCache.getLoginUserTopUnitName()); - } - - if( check && wrapIn.getId() != null && !wrapIn.getId().isEmpty() ){ - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.get( wrapIn.getId() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportQueryById( e, wrapIn.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - // 补充状态信息 - if (check) { - if ( okrWorkReportBaseInfo == null) { - // 补充汇报标题以及汇报次数信息 - if (wrapIn.getReportCount() == null || wrapIn.getReportCount() == 0) { - try { - maxReportCount = okrWorkReportOperationService.getMaxReportCount(okrWorkBaseInfo.getId()); - wrapIn.setReportCount((maxReportCount + 1)); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportMaxReportCountQuery( e, okrWorkBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if (wrapIn.getTitle() == null || wrapIn.getTitle().isEmpty()) { - // 根据已知信息组织汇报标题和汇简要标题 - wrapIn.setTitle( okrWorkBaseInfo.getTitle() ); - wrapIn.setShortTitle( "第" + wrapIn.getReportCount() + "次工作汇报" ); - } - } else { - wrapIn.setReportCount(okrWorkReportBaseInfo.getReportCount()); - wrapIn.setTitle(okrWorkReportBaseInfo.getTitle()); - wrapIn.setShortTitle(okrWorkReportBaseInfo.getShortTitle()); - } - // 草稿|管理员督办|领导批示|已完成 - wrapIn.setProcessStatus( "草稿" ); - wrapIn.setStatus( "正常" ); - } - - if( check ){ - try { - //是否汇报工作的进展进度数字 - report_progress = okrConfigSystemService.getValueWithConfigCode( "REPORT_PROGRESS" ); - if( report_progress == null || report_progress.isEmpty() ){ - report_progress = "CLOSE"; - } - } catch (Exception e) { - report_progress = "CLOSE"; - logger.warn( "system get config got an exception." ); - logger.error(e); - } - } - - if( check ){ - try { - wrapIn.setSubmitTime( new Date() ); //保存提交时间 - wrapIn.setWorkType( okrWorkBaseInfo.getWorkType() ); - wrapIn.setCreateTime( wrapIn.getSubmitTime() ); - wrapIn.setUpdateTime( wrapIn.getSubmitTime() ); - okrWorkReportBaseInfo = okrWorkReportFlowService.submitReportInfo( wrapIn, okrCenterWorkInfo, okrWorkBaseInfo, wrapIn.getWorkPointAndRequirements(), - wrapIn.getProgressDescription(), wrapIn.getWorkPlan(), wrapIn.getAdminSuperviseInfo(), wrapIn.getMemo(), wrapIn.getOpinion() ); - wrapIn.setId( okrWorkReportBaseInfo.getId() ); - result.setData( new Wo( okrWorkReportBaseInfo.getId()) ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWorkReportSubmit( e, okrWorkReportBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - okrWorkBaseInfoService.analyseWorkProgress( okrWorkReportBaseInfo.getWorkId(), okrWorkReportBaseInfo, report_progress, dateOperation.getNowDateTime() ); - } catch (Exception e ) { - logger.warn( "system analyse work progres got an exceptin.", e ); - result.error( e ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - //发送待阅信息 - //工作负责人提交汇报后，工作的所有授权者都需要收到一条关于该工作汇报的待阅信息，知晓工作负责人已经提交工作汇报 - //向该工作所有的[授权人]发送待阅信息 - if( okrWorkReportBaseInfo != null ) { - Listauthorize_ids = okrWorkAuthorizeRecordService.listByWorkId( okrWorkReportBaseInfo.getWorkId() ); - if( authorize_ids != null ){ - for( String authorize_id : authorize_ids ){ - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.get( authorize_id ); - if( okrWorkAuthorizeRecord != null ){ - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkAuthorizeRecord.getDelegatorIdentity() ); - //给授权人发送短信 - SmsMessageOperator.sendWithPersonName(okrWorkAuthorizeRecord.getDelegatorName(), "工作汇报'"+okrWorkReportBaseInfo.getTitle()+"'已经提交，请查看！"); - } - } - } - } - //记录工作动态信息 - if( okrWorkReportBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkReport( okrWorkReportBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "提交工作汇报", - "新的工作汇报信息提交成功！" - ); - //SmsMessageOperator.send(okrWorkReportBaseInfo.getWorkAdminName(), "工作汇报'"+okrWorkReportBaseInfo.getTitle()+"'已经提交，请查看！"); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitLeaderOpinion.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitLeaderOpinion.java deleted file mode 100644 index e506cf7742..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSubmitLeaderOpinion.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionGetOkrUserCache; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionLeaderOpinionSubmit; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionSystemConfigQueryByCode; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionUserNoLogin; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ActionSubmitLeaderOpinion extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSubmitLeaderOpinion.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, OkrWorkReportBaseInfo okrWorkReportBaseInfo, String opinion ) throws Exception { - ActionResult result = new ActionResult<>(); - Boolean check = true; - OkrUserCache okrUserCache = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - String reportor_audit_notice = null; - String report_supervisorIdentity = null; - String report_progress = "CLOSE"; - - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName( effectivePerson.getDistinguishedName() ); - }catch(Exception e){ - check = false; - Exception exception = new ExceptionGetOkrUserCache( e, effectivePerson.getDistinguishedName() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check && okrUserCache == null ){ - check = false; - Exception exception = new ExceptionUserNoLogin( effectivePerson.getDistinguishedName() ); - result.error( exception ); - } - - if( check ){ - try { - reportor_audit_notice = okrConfigSystemService.getValueWithConfigCode( "REPORTOR_AUDIT_NOTICE" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigQueryByCode( e, "REPORTOR_AUDIT_NOTICE" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - report_supervisorIdentity = okrConfigSystemService.getValueWithConfigCode( "REPORT_SUPERVISOR" ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionSystemConfigQueryByCode( e, "REPORT_SUPERVISOR" ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if ( check ) { - if( opinion == null || opinion.isEmpty() ){ - opinion = "已阅。"; - } - } - - if( check ){ - try { - okrWorkReportFlowService.leaderProcess( okrWorkReportBaseInfo, opinion, okrUserCache.getLoginIdentityName() ); - result.setData( new Wo( okrWorkReportBaseInfo.getId() ) ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionLeaderOpinionSubmit( e, okrWorkReportBaseInfo.getId() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - try { - //是否汇报工作的进展进度数字 - report_progress = okrConfigSystemService.getValueWithConfigCode( "REPORT_PROGRESS" ); - if( report_progress == null || report_progress.isEmpty() ){ - report_progress = "CLOSE"; - } - } catch (Exception e) { - report_progress = "CLOSE"; - logger.warn( "system get config got an exception." ); - logger.error(e); - } - } - if( check ){ - try { - okrWorkBaseInfoService.analyseWorkProgress( okrWorkReportBaseInfo.getWorkId(),okrWorkReportBaseInfo, report_progress, dateOperation.getNowDateTime() ); - } catch (Exception e ) { - logger.warn( "system analyse work progres got an exceptin.", e ); - result.error( e ); - logger.error( e, effectivePerson, request, null); - } - } - if(check) { - //发送待阅信息 - //领导审批信息提交后，向负责人和所有的授权人 - //如果该汇报是经过督办员审核的，那么督办员也需要收到待阅信息 - if( okrWorkReportBaseInfo != null ) { - if( "OPEN".equalsIgnoreCase( reportor_audit_notice )){ - //1、向汇报人发送待阅信息 - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkReportBaseInfo.getReporterIdentity() ); - //2、向该工作所有的授权人发送待阅信息 - List authorize_ids = okrWorkAuthorizeRecordService.listByWorkId( okrWorkReportBaseInfo.getWorkId() ); - if( authorize_ids != null ){ - for( String authorize_id : authorize_ids ){ - //logger.info( "工作的授权信息ID:" + authorize_id ); - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.get( authorize_id ); - if( okrWorkAuthorizeRecord != null ){ - //logger.info( "工作的授权人:" + okrWorkAuthorizeRecord.getDelegatorIdentity() ); - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkAuthorizeRecord.getDelegatorIdentity() ); - } - } - } - //3、如果该汇报是经过督办员审核的，那么督办员也需要收到待阅信息 - if( okrWorkReportBaseInfo.getReportWorkflowType() != null && "ADMIN_AND_ALLLEADER".equalsIgnoreCase( okrWorkReportBaseInfo.getReportWorkflowType())){ - if( report_supervisorIdentity != null && !report_supervisorIdentity.isEmpty() ){ - sendWorkReportReadTask( okrWorkReportBaseInfo, report_supervisorIdentity ); - } - } - }else{ - if( "已完成".equals( okrWorkReportBaseInfo.getProcessStatus() )){ - //1、向汇报人发送待阅信息 - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkReportBaseInfo.getReporterIdentity() ); - //2、向该工作所有的授权人发送待阅信息 - List authorize_ids = okrWorkAuthorizeRecordService.listByWorkId( okrWorkReportBaseInfo.getWorkId() ); - if( authorize_ids != null ){ - for( String authorize_id : authorize_ids ){ - //logger.info( "工作的授权信息ID:" + authorize_id ); - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.get( authorize_id ); - if( okrWorkAuthorizeRecord != null ){ - //logger.info( "工作的授权人:" + okrWorkAuthorizeRecord.getDelegatorIdentity() ); - sendWorkReportReadTask( okrWorkReportBaseInfo, okrWorkAuthorizeRecord.getDelegatorIdentity() ); - } - } - } - } - } - } - } - if(check) { - //记录工作动态信息 - if( okrWorkReportBaseInfo != null ) { - WrapInWorkDynamic.sendWithWorkReport( okrWorkReportBaseInfo, - effectivePerson.getDistinguishedName(), - okrUserCache.getLoginUserName(), - okrUserCache.getLoginIdentityName() , - "提交工作汇报", - "工作汇报流转[领导审批]提交成功！" - ); - } - } - return result; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/BaseAction.java deleted file mode 100644 index 89fa6bb35e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/BaseAction.java +++ /dev/null @@ -1,1547 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.jaxrs.WoId; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrConfigWorkTypeService; -import com.x.okr.assemble.control.service.OkrTaskService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkAuthorizeRecordService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDetailInfoService; -import com.x.okr.assemble.control.service.OkrWorkDynamicsService; -import com.x.okr.assemble.control.service.OkrWorkReportDetailInfoService; -import com.x.okr.assemble.control.service.OkrWorkReportFlowService; -import com.x.okr.assemble.control.service.OkrWorkReportOperationService; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; -import com.x.okr.assemble.control.service.OkrWorkReportProcessLogService; -import com.x.okr.assemble.control.service.OkrWorkReportQueryService; -import com.x.okr.assemble.control.service.OkrWorkReportTaskCollectService; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkReportFlowService okrWorkReportFlowService = new OkrWorkReportFlowService(); - protected OkrWorkReportOperationService okrWorkReportOperationService = new OkrWorkReportOperationService(); - protected OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - protected OkrWorkReportDetailInfoService okrWorkReportDetailInfoService = new OkrWorkReportDetailInfoService(); - protected OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - protected OkrWorkReportProcessLogService okrWorkReportProcessLogService = new OkrWorkReportProcessLogService(); - protected OkrCenterWorkQueryService okrCenterWorkInfoService = new OkrCenterWorkQueryService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkDetailInfoService okrWorkDetailInfoService = new OkrWorkDetailInfoService(); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - protected OkrWorkDynamicsService okrWorkDynamicsService = new OkrWorkDynamicsService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected OkrTaskService okrTaskService = new OkrTaskService(); - protected OkrConfigWorkTypeService okrConfigWorkTypeService = new OkrConfigWorkTypeService(); - protected OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - protected OkrWorkAuthorizeRecordService okrWorkAuthorizeRecordService = new OkrWorkAuthorizeRecordService(); - protected DateOperation dateOperation = new DateOperation(); - - public static class WoOkrCenterWorkInfo extends OkrCenterWorkInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrCenterWorkInfo.class, WoOkrCenterWorkInfo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe("所有的工作列表") - private List works = null; - - @FieldDescribe("所有的工作类别列表") - private List workTypes = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):CREATEWORK|IMPORTWORK|DEPLOY|ARCHIVE|CLOSE|DELETE") - private List operation = null; - - @FieldDescribe("是否为新创建的草稿信息") - private Boolean isNew = true; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getWorks() { - return works; - } - - public void setWorks(List works) { - this.works = works; - } - - public List getWorkTypes() { - return workTypes; - } - - public void setWorkTypes(List workTypes) { - this.workTypes = workTypes; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - public Boolean getIsNew() { - return isNew; - } - - public void setIsNew(Boolean isNew) { - this.isNew = isNew; - } - - } - - public static class WoOkrCenterWorkViewInfo { - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrCenterWorkInfo.class, WoOkrCenterWorkViewInfo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe("中心工作ID") - private String id = ""; - - @FieldDescribe("中心标题") - private String title = ""; - - @FieldDescribe("部署者姓名") - private String deployerName = ""; - - @FieldDescribe("部署者身份") - private String deployerIdentity = ""; - - @FieldDescribe("部署者所属组织") - private String deployerUnitName = ""; - - @FieldDescribe("部署者所属顶层组织") - private String deployerTopUnitName = ""; - - @FieldDescribe("审核者姓名，多值") - private List auditLeaderNameList = null; - - @FieldDescribe("审核者身份，多值") - private List auditLeaderIdentityList = null; - - @FieldDescribe("中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消") - private String processStatus = "草稿"; - - @FieldDescribe("中心工作默认完成日期-字符串，显示用：yyyy-mm-dd") - private String defaultCompleteDateLimitStr = ""; - - @FieldDescribe("中心工作默认工作类别") - private String defaultWorkType = ""; - - @FieldDescribe("中心工作默认工作级别") - private String defaultWorkLevel = ""; - - @FieldDescribe("中心工作默认阅知领导(可多值，显示用)") - private List defaultLeaderList = null; - - @FieldDescribe("中心工作默认阅知领导身份(多值)") - private List defaultLeaderIdentityList = null; - - @FieldDescribe("工作汇报审批领导(多值)") - private List reportAuditLeaderNameList = null; - - @FieldDescribe("工作汇报审批领导身份(多值)") - private List reportAuditLeaderIdentityList = null; - - @FieldDescribe("中心工作是否需要审核") - private Boolean isNeedAudit = false; - - @FieldDescribe("处理状态：正常|已删除") - private String status = "正常"; - - @FieldDescribe("中心工作描述") - private String description = ""; - - @FieldDescribe("工作处理职责身份(多值): VIEW(观察者)|DEPLOY(部署者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)|REPORTAUDIT(汇报审核者)") - private List workProcessIdentity = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):VIEW|EDIT|DELETE") - private List operation = null; - - private Boolean watch = false; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - public String getDefaultWorkType() { - return defaultWorkType; - } - - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - public List getAuditLeaderNameList() { - return auditLeaderNameList == null?new ArrayList<>():auditLeaderNameList; - } - - public List getAuditLeaderIdentityList() { - return auditLeaderIdentityList == null?new ArrayList<>():auditLeaderIdentityList; - } - - public List getDefaultLeaderList() { - return defaultLeaderList == null?new ArrayList<>():defaultLeaderList; - } - - public List getDefaultLeaderIdentityList() { - return defaultLeaderIdentityList == null?new ArrayList<>():defaultLeaderIdentityList; - } - - public List getReportAuditLeaderNameList() { - return reportAuditLeaderNameList == null?new ArrayList<>():reportAuditLeaderNameList; - } - - public List getReportAuditLeaderIdentityList() { - return reportAuditLeaderIdentityList == null?new ArrayList<>():reportAuditLeaderIdentityList; - } - - public void setAuditLeaderNameList(List auditLeaderNameList) { - this.auditLeaderNameList = auditLeaderNameList; - } - - public void setAuditLeaderIdentityList(List auditLeaderIdentityList) { - this.auditLeaderIdentityList = auditLeaderIdentityList; - } - - public void setDefaultLeaderList(List defaultLeaderList) { - this.defaultLeaderList = defaultLeaderList; - } - - public void setDefaultLeaderIdentityList(List defaultLeaderIdentityList) { - this.defaultLeaderIdentityList = defaultLeaderIdentityList; - } - - public void setReportAuditLeaderNameList(List reportAuditLeaderNameList) { - this.reportAuditLeaderNameList = reportAuditLeaderNameList; - } - - public void setReportAuditLeaderIdentityList(List reportAuditLeaderIdentityList) { - this.reportAuditLeaderIdentityList = reportAuditLeaderIdentityList; - } - } - - public static class WoOkrWorkBaseInfo extends OkrWorkBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkBaseInfo.class, WoOkrWorkBaseInfo.class, null, JpaObject.FieldsInvisible); - - private List subWrapOutOkrWorkBaseInfos = null; - - private List okrWorkAuthorizeRecords = null; - - private WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - - private String workOutType = "SUBWORK"; - - private String workDetail = null; - - private String dutyDescription = null; - - private String landmarkDescription = null; - - private String majorIssuesDescription = null; - - private String progressAction = null; - - private String progressPlan = null; - - private String resultDescription = null; - - private Boolean hasNoneSubmitReport = false; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getSubWrapOutOkrWorkBaseInfos() { - return subWrapOutOkrWorkBaseInfos; - } - - public void setSubWrapOutOkrWorkBaseInfos(List subWrapOutOkrWorkBaseInfos) { - this.subWrapOutOkrWorkBaseInfos = subWrapOutOkrWorkBaseInfos; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseInfo workBaseInfo) { - if (this.subWrapOutOkrWorkBaseInfos == null) { - this.subWrapOutOkrWorkBaseInfos = new ArrayList(); - } - if (!subWrapOutOkrWorkBaseInfos.contains(workBaseInfo)) { - subWrapOutOkrWorkBaseInfos.add(workBaseInfo); - } - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - /** - * 判断是父级工作还是子工作 - * - * @return - */ - public String getWorkOutType() { - return workOutType; - } - - /** - * 判断是父级工作还是子工作 - * - * @param workOutType - */ - public void setWorkOutType(String workOutType) { - this.workOutType = workOutType; - } - - public List getOkrWorkAuthorizeRecords() { - return okrWorkAuthorizeRecords; - } - - public void setOkrWorkAuthorizeRecords(List okrWorkAuthorizeRecords) { - this.okrWorkAuthorizeRecords = okrWorkAuthorizeRecords; - } - - public WoOkrWorkAuthorizeRecord getOkrWorkAuthorizeRecord() { - return okrWorkAuthorizeRecord; - } - - public void setOkrWorkAuthorizeRecord(WoOkrWorkAuthorizeRecord okrWorkAuthorizeRecord) { - this.okrWorkAuthorizeRecord = okrWorkAuthorizeRecord; - } - - public Boolean getHasNoneSubmitReport() { - return hasNoneSubmitReport; - } - - public void setHasNoneSubmitReport(Boolean hasNoneSubmitReport) { - this.hasNoneSubmitReport = hasNoneSubmitReport; - } - - } - - public static class WoOkrWorkBaseSimpleInfo { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkBaseInfo.class, WoOkrWorkBaseSimpleInfo.class, null, JpaObject.FieldsInvisible); - - @FieldDescribe("子工作信息列表") - private List subWorks = null; - - @FieldDescribe("工作ID") - private String id = null; - - @FieldDescribe("上级工作ID") - private String parentWorkId = null; - - @FieldDescribe("工作标题") - private String title = null; - - @FieldDescribe("中心工作ID") - private String centerId = null; - - @FieldDescribe("中心工作标题") - private String centerTitle = null; - - @FieldDescribe("部署者姓名") - private String deployerName = null; - - @FieldDescribe("部署者身份") - private String deployerIdentity = null; - - @FieldDescribe("部署者所属组织") - private String deployerUnitName = null; - - @FieldDescribe("部署者所属顶层组织") - private String deployerTopUnitName = null; - - @FieldDescribe("主责人姓名") - private String responsibilityEmployeeName = null; - - @FieldDescribe("主责人身份") - private String responsibilityIdentity = null; - - @FieldDescribe("主责人所属组织") - private String responsibilityUnitName = null; - - @FieldDescribe("主责人所属顶层组织") - private String responsibilityTopUnitName = null; - - @FieldDescribe("协助人姓名，多值") - private List cooperateEmployeeNameList = null; - - @FieldDescribe("协助人身份，多值") - private List cooperateIdentityList = null; - - @FieldDescribe("协助人所属组织，多值") - private List cooperateUnitNameList = null; - - @FieldDescribe("协助人所属顶层组织，多值") - private List cooperateTopUnitNameList = null; - - @FieldDescribe("阅知领导身份，多值") - private List readLeaderIdentityList = null; - - @FieldDescribe("阅知领导，多值") - private List readLeaderNameList = null; - - @FieldDescribe("阅知领导所属组织，多值") - private List readLeaderUnitNameList = null; - - @FieldDescribe("阅知领导所属顶层组织，多值") - private List readLeaderTopUnitNameList = null; - - @FieldDescribe("工作类别") - private String workType = null; - - @FieldDescribe("工作级别") - private String workLevel = null; - - @FieldDescribe("工作进度") - private Integer overallProgress = 0; - - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - private String workProcessStatus = "草稿"; - - @FieldDescribe("工作是否已超期") - private Boolean isOverTime = false; - - @FieldDescribe("工作是否已完成") - private Boolean isCompleted = false; - - @FieldDescribe("工作详细描述, 事项分解") - private String workDetail = null; - - @FieldDescribe("职责描述") - private String dutyDescription = null; - - @FieldDescribe("里程碑标志说明") - private String landmarkDescription = null; - - @FieldDescribe("重点事项说明") - private String majorIssuesDescription = null; - - @FieldDescribe("具体行动举措") - private String progressAction = null; - - @FieldDescribe("进展计划时限说明") - private String progressPlan = null; - - @FieldDescribe("交付成果说明") - private String resultDescription = null; - - @FieldDescribe("是否可以查看工作详情") - private Boolean watch = false; - - @FieldDescribe("完成时限") - private String completeDateLimitStr = null; - - @FieldDescribe("工作处理职责身份(多值): AUTHORZE(授权中)|TACKBACK(授权收回)|AUTHORIZECANCEL(授权失效)|VIEW(观察者)|RESPONSIBILITY(责任者)|COOPERATE(协助者)|READ(阅知者)") - private List workProcessIdentity = null; - - @FieldDescribe("用户可以对工作进行的操作(多值):VIEW|EDIT|SPLIT|AUTHORIZE|TACKBACK|REPORT|DELETE|") - private List operation = null; - - @FieldDescribe("工作信息状态：正常|已删除|已归档") - private String status = "正常"; - - @FieldDescribe("标识工作信息是具体工作,还是中心工作：WORK|CENTER") - private String workOrCenter = "WORK"; - - @FieldDescribe("标识工作信息是否已经被拆解过了,是否存在下级工作信息") - private Boolean hasSubWorks = false; - - @FieldDescribe("归档日期") - private Date archiveDate = null; - - @FieldDescribe("完成日期日期") - private Date completeTime = null; - - private Date createTime; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCenterId() { - return centerId; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public List getSubWorks() { - return subWorks; - } - - public void setSubWorks(List subWorks) { - this.subWorks = subWorks; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public Integer getOverallProgress() { - return overallProgress; - } - - public void setOverallProgress(Integer overallProgress) { - this.overallProgress = overallProgress; - } - - public String getWorkProcessStatus() { - return workProcessStatus; - } - - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - public Boolean getIsOverTime() { - return isOverTime; - } - - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - public Boolean getIsCompleted() { - return isCompleted; - } - - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - public Boolean getWatch() { - return watch; - } - - public void setWatch(Boolean watch) { - this.watch = watch; - } - - public String getParentWorkId() { - return parentWorkId; - } - - public void setParentWorkId(String parentWorkId) { - this.parentWorkId = parentWorkId; - } - - public void addNewSubWorkBaseInfo(WoOkrWorkBaseSimpleInfo work) { - if (subWorks == null) { - subWorks = new ArrayList(); - } - subWorks.add(work); - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public List getWorkProcessIdentity() { - return workProcessIdentity; - } - - public void setWorkProcessIdentity(List workProcessIdentity) { - this.workProcessIdentity = workProcessIdentity; - } - - public List getOperation() { - return operation; - } - - public void setOperation(List operation) { - this.operation = operation; - } - - public String getDeployerName() { - return deployerName; - } - - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getDeployerUnitName() { - return deployerUnitName; - } - - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getWorkOrCenter() { - return workOrCenter; - } - - public void setWorkOrCenter(String workOrCenter) { - this.workOrCenter = workOrCenter; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Boolean getHasSubWorks() { - return hasSubWorks; - } - - public void setHasSubWorks(Boolean hasSubWorks) { - this.hasSubWorks = hasSubWorks; - } - - public Date getArchiveDate() { - return archiveDate; - } - - public Date getCompleteTime() { - return completeTime; - } - - public void setArchiveDate(Date archiveDate) { - this.archiveDate = archiveDate; - } - - public void setCompleteTime(Date completeTime) { - this.completeTime = completeTime; - } - - public List getCooperateEmployeeNameList() { - return cooperateEmployeeNameList==null?new ArrayList<>():cooperateEmployeeNameList; - } - - public List getCooperateIdentityList() { - return cooperateIdentityList==null?new ArrayList<>():cooperateIdentityList; - } - - public List getCooperateUnitNameList() { - return cooperateUnitNameList==null?new ArrayList<>():cooperateUnitNameList; - } - - public List getCooperateTopUnitNameList() { - return cooperateTopUnitNameList==null?new ArrayList<>():cooperateTopUnitNameList; - } - - public List getReadLeaderIdentityList() { - return readLeaderIdentityList==null?new ArrayList<>():readLeaderIdentityList; - } - - public List getReadLeaderNameList() { - return readLeaderNameList==null?new ArrayList<>():readLeaderNameList; - } - - public List getReadLeaderUnitNameList() { - return readLeaderUnitNameList==null?new ArrayList<>():readLeaderUnitNameList; - } - - public List getReadLeaderTopUnitNameList() { - return readLeaderTopUnitNameList==null?new ArrayList<>():readLeaderTopUnitNameList; - } - - public void setCooperateEmployeeNameList(List cooperateEmployeeNameList) { - this.cooperateEmployeeNameList = cooperateEmployeeNameList; - } - - public void setCooperateIdentityList(List cooperateIdentityList) { - this.cooperateIdentityList = cooperateIdentityList; - } - - public void setCooperateUnitNameList(List cooperateUnitNameList) { - this.cooperateUnitNameList = cooperateUnitNameList; - } - - public void setCooperateTopUnitNameList(List cooperateTopUnitNameList) { - this.cooperateTopUnitNameList = cooperateTopUnitNameList; - } - - public void setReadLeaderIdentityList(List readLeaderIdentityList) { - this.readLeaderIdentityList = readLeaderIdentityList; - } - - public void setReadLeaderNameList(List readLeaderNameList) { - this.readLeaderNameList = readLeaderNameList; - } - - public void setReadLeaderUnitNameList(List readLeaderUnitNameList) { - this.readLeaderUnitNameList = readLeaderUnitNameList; - } - - public void setReadLeaderTopUnitNameList(List readLeaderTopUnitNameList) { - this.readLeaderTopUnitNameList = readLeaderTopUnitNameList; - } - - } - - public static class WoOkrWorkAuthorizeRecord extends OkrWorkAuthorizeRecord { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkAuthorizeRecord.class, WoOkrWorkAuthorizeRecord.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class WoOkrWorkType { - - @FieldDescribe("工作类别ID") - private String id = null; - - @FieldDescribe("工作类别名称") - private String workTypeName = null; - - @FieldDescribe("工作类别排序号") - private Integer orderNumber = null; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public WoOkrWorkType() { - - } - - public WoOkrWorkType(String id, String name, Integer orderNumber) { - this.id = id; - this.workTypeName = name; - this.orderNumber = orderNumber; - } - - public String getWorkTypeName() { - return workTypeName; - } - - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - - public Integer getOrderNumber() { - return orderNumber; - } - - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; - } - } - - public static class WoOkrAttachmentFileInfo extends OkrAttachmentFileInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrAttachmentFileInfo.class, WoOkrAttachmentFileInfo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - } - - public static class WoOkrWorkReportBaseInfo extends OkrWorkReportBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkReportBaseInfo.class, WoOkrWorkReportBaseInfo.class, null, JpaObject.FieldsInvisible); - private Boolean isReporter = false; - - private Boolean isWorkAdmin = false; - - private Boolean isReadLeader = false; - - private Boolean isCreator = false; - - private Boolean needReportProgress = false; - - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private List processLogs = null; - - private WoOkrWorkBaseInfo workInfo = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Boolean getIsReporter() { - return isReporter; - } - - public void setIsReporter(Boolean isReporter) { - this.isReporter = isReporter; - } - - public Boolean getIsWorkAdmin() { - return isWorkAdmin; - } - - public void setIsWorkAdmin(Boolean isWorkAdmin) { - this.isWorkAdmin = isWorkAdmin; - } - - public Boolean getIsReadLeader() { - return isReadLeader; - } - - public void setIsReadLeader(Boolean isReadLeader) { - this.isReadLeader = isReadLeader; - } - - public Boolean getIsCreator() { - return isCreator; - } - - public void setIsCreator(Boolean isCreator) { - this.isCreator = isCreator; - } - - public String getProgressDescription() { - return progressDescription; - } - - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - - public String getWorkPlan() { - return workPlan; - } - - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public List getProcessLogs() { - return processLogs; - } - - public void setProcessLogs(List processLogs) { - this.processLogs = processLogs; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public WoOkrWorkBaseInfo getWorkInfo() { - return workInfo; - } - - public void setWorkInfo(WoOkrWorkBaseInfo workInfo) { - this.workInfo = workInfo; - } - - public Boolean getNeedReportProgress() { - return needReportProgress; - } - - public void setNeedReportProgress(Boolean needReportProgress) { - this.needReportProgress = needReportProgress; - } - - } - - public static class WoOkrWorkReportBaseSimpleInfo { - - public static WrapCopier copier = WrapCopierFactory - .wo(OkrWorkReportBaseInfo.class, WoOkrWorkReportBaseSimpleInfo.class, null, - JpaObject.FieldsInvisible); - - @FieldDescribe("汇报ID.") - private String id; - - @FieldDescribe("工作汇报标题") - private String title = null; - - @FieldDescribe("工作汇报短标题") - private String shortTitle = null; - - @FieldDescribe("工作汇报当前环节") - private String activityName = "草稿"; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getShortTitle() { - return shortTitle; - } - - public void setShortTitle(String shortTitle) { - this.shortTitle = shortTitle; - } - - public String getActivityName() { - return activityName; - } - - public void setActivityName(String activityName) { - this.activityName = activityName; - } - } - - public static class WoOkrWorkDeployAuthorizeRecord { - - @FieldDescribe("工作ID") - private String workId = ""; - - @FieldDescribe("工作标题") - private String workTitle = ""; - - @FieldDescribe("工作部署|授权操作者身份") - private String source = ""; - - @FieldDescribe("工作部署|授权操作接收者身份") - private String target; - - @FieldDescribe("工作部署|授权操作时间") - private String operationTime; - - @FieldDescribe("工作部署|授权操作类型:授权|收回|部署") - private String operationTypeCN; - - @FieldDescribe("DEPLOY|AUTHORIZE|TACKBACK") - private String operationType; - - @FieldDescribe("工作部署|授权操作意见") - private String opinion; - - private String description = ""; - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getOperationTime() { - return operationTime; - } - - public void setOperationTime(String operationTime) { - this.operationTime = operationTime; - } - - public String getOperationType() { - return operationType; - } - - public void setOperationType(String operationType) { - this.operationType = operationType; - } - - public String getOpinion() { - return opinion; - } - - public void setOpinion(String opinion) { - this.opinion = opinion; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getWorkTitle() { - return workTitle; - } - - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getOperationTypeCN() { - return operationTypeCN; - } - - public void setOperationTypeCN(String operationTypeCN) { - this.operationTypeCN = operationTypeCN; - } - } - - public static class WoOkrWorkReportProcessLog extends OkrWorkReportProcessLog { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( - OkrWorkReportProcessLog.class, WoOkrWorkReportProcessLog.class, null, - JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } - - public static class Wo extends WoId { - public Wo(String id) { - this.setId(id); - } - } - - public static class WiOkrWorkReportBaseInfo extends OkrWorkReportBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - private String workPointAndRequirements = ""; - /** - * 填写汇报时填写的具体进展描述信息 - */ - private String progressDescription = ""; - /** - * 下一步工作计划信息 - */ - private String workPlan = ""; - /** - * 管理员督办信息 - */ - private String adminSuperviseInfo = ""; - /** - * 说明备注信息 - */ - private String memo = ""; - - private String opinion = ""; - - public String getProgressDescription() { - return progressDescription; - } - - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - - public String getWorkPlan() { - return workPlan; - } - - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public String getOpinion() { - return opinion; - } - - public void setOpinion(String opinion) { - this.opinion = opinion; - } - } - - protected void sendWorkReportReadTask(OkrWorkReportBaseInfo okrWorkReportBaseInfo, String userIdentity) - throws Exception { - String userUnitName = null; - String userTopUnitName = null; - String personName = null; - List ids = okrTaskService.listIdsByTargetActivityAndObjId("汇报确认", okrWorkReportBaseInfo.getId(), "汇报确认", - userIdentity); - if (ids == null || ids.isEmpty()) { - personName = okrUserManagerService.getPersonNameByIdentity(userIdentity); - if (personName != null) { - userUnitName = okrUserManagerService.getUnitNameByIdentity(userIdentity); - userTopUnitName = okrUserManagerService.getTopUnitNameByIdentity(userIdentity); - okrWorkReportFlowService.addReportConfirmReader(okrWorkReportBaseInfo, userIdentity, personName, - userUnitName, userTopUnitName); - } - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAction.java deleted file mode 100644 index 67f6af8cb2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAction.java +++ /dev/null @@ -1,358 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.BaseAction.WiOkrWorkReportBaseInfo; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.BaseAction.Wo; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.BaseAction.WoOkrWorkReportBaseInfo; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception.ExceptionWrapInConvert; - -@Path("okrworkreportbaseinfo") -@JaxrsDescribe("工作汇报信息管理服务") -public class OkrWorkReportBaseInfoAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkReportBaseInfoAction.class); - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报信息", action = ActionDraftReport.class) - @GET - @Path("draft/{workId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void draft(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("workId") String workId) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDraftReport().execute(request, effectivePerson, workId); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteDraftReport got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "新建或者更新工作汇报信息", action = ActionDraftReport.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - WiOkrWorkReportBaseInfo wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn(jsonElement, WiOkrWorkReportBaseInfo.class); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionWrapInConvert(e, jsonElement); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - if (check) { - try { - result = new ActionSave().execute(request, effectivePerson, wrapIn); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteSave got an exception. "); - } - } - - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - /** - * 确定汇报工作流 1、先确定工作汇报工作流执行方式：1）工作管理员督办 - 中心工作阅知领导审阅； 2）工作部署者审阅 2、如果是方式1） - * a.判断系统设置中是否有设置工作管理员 b.如果有设置工作管理员，那么下一步处理者为工作管理员，如果没有设置工作管理员，那么判断中心工作是否有设置阅知领导 - * c.如果中心工作没有设置阅知领导，那么下一步处理者为工作部署者审阅，并且在汇报的descript中说明原因 3、汇报工作流执行方式生效工作层级 - * - * @param request - * @param wrapIn - * @return - */ - @JaxrsMethodDescribe(value = "提交工作汇报信息", action = ActionSubmit.class) - @Path("submit") - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void submit(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - Boolean check = true; - - if (check) { - try { - result = new ActionSubmit().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteSubmit got an exception. "); - } - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作汇报信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteDelete got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID将工作汇报信息调度到结束", action = ActionDispatchToOver.class) - @GET - @Path("dispatch/{id}/over") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void dispatchOver(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDispatchToOver().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteDispatchToOver got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据工作ID获取工作汇报信息", action = ActionListByWork.class) - @GET - @Path("list/work/{workId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listByWork(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("具体工作信息ID") @PathParam("workId") String workId) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListByWork().execute(request, effectivePerson, workId); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[草稿],下一页", action = ActionListDraftNextWithFilter.class) - @PUT - @Path("draft/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDraftNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListDraftNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[草稿],上一页", action = ActionListDraftPrevWithFilter.class) - @PUT - @Path("draft/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyDraftPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @PathParam("id") String id, @PathParam("count") Integer count, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListDraftPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[处理中（待办）],下一页", action = ActionListMyTaskNextWithFilter.class) - @PUT - @Path("task/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyTaskNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyTaskNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[处理中（待办）],上一页", action = ActionListMyTaskPrevWithFilter.class) - @PUT - @Path("task/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyTaskPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyTaskPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[已处理（已办）],下一页", action = ActionListMyProcessNextWithFilter.class) - @PUT - @Path("process/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyProcessNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyProcessNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[已处理（已办）],上一页", action = ActionListMyProcessPrevWithFilter.class) - @PUT - @Path("process/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyProcessPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyProcessPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[已归档],下一页", action = ActionListMyArchiveNextWithFilter.class) - @PUT - @Path("archive/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyArchiveNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyArchiveNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示满足过滤条件查询的工作汇报信息，[已归档],上一页", action = ActionListMyArchivePrevWithFilter.class) - @PUT - @Path("archive/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listMyArchivePrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListMyArchivePrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAdminAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAdminAction.java deleted file mode 100644 index a1689c6963..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/OkrWorkReportBaseInfoAdminAction.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutBoolean; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.BaseAction.Wo; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.BaseAction.WoOkrWorkReportBaseInfo; - -@Path("admin/okrworkreportbaseinfo") -@JaxrsDescribe("工作汇报信息数据管理服务") -public class OkrWorkReportBaseInfoAdminAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkReportBaseInfoAdminAction.class); - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报信息", action = ActionAutoCreateWorkReport.class) - @GET - @Path("create") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void reportAutoCreate(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionAutoCreateWorkReport().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作汇报信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报信息", action = ActionDelete.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGetFullInfo().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的工作汇报信息,下一页", action = ActionListNextWithFilter.class) - @PUT - @Path("filter/list/{id}/next/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListNextWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "列示根据过滤条件查询的工作汇报信息,上一页", action = ActionListPrevWithFilter.class) - @PUT - @Path("filter/list/{id}/prev/{count}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void filterListPrevWithFilter(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, @JaxrsParameterDescribe("最后一条信息数据的ID") @PathParam("id") String id, - @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/WrapInFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/WrapInFilter.java deleted file mode 100644 index 39d16de4f3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/WrapInFilter.java +++ /dev/null @@ -1,234 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo; -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.gson.GsonPropertyObject; - -public class WrapInFilter extends GsonPropertyObject { - private String query_deployerName; - - private String query_deployerUnitName; - - private String query_deployerTopUnitName; - - private String title ; - - private String processIdentity; - - private List workIds; - - private List processStatusList; - - private List deployerNames; - - private List deployerUnitNames; - - private List deployerTopUnitNames; - - private String query_creatorName; - - private String query_creatorUnitName; - - private String query_creatorTopUnitName; - - private List creatorNames; - - private List creatorUnitNames; - - private List creatorTopUnitNames; - - private String sequenceField = JpaObject.sequence_FIELDNAME; - - private String key; - - private String order = "DESC"; - - private List q_statuses; - - public String getQuery_deployerName() { - return query_deployerName; - } - - public void setQuery_deployerName(String query_deployerName) { - this.query_deployerName = query_deployerName; - } - - public String getQuery_deployerUnitName() { - return query_deployerUnitName; - } - - public void setQuery_deployerUnitName(String query_deployerUnitName) { - this.query_deployerUnitName = query_deployerUnitName; - } - - public String getQuery_deployerTopUnitName() { - return query_deployerTopUnitName; - } - - public void setQuery_deployerTopUnitName(String query_deployerTopUnitName) { - this.query_deployerTopUnitName = query_deployerTopUnitName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getProcessIdentity() { - return processIdentity; - } - - public void setProcessIdentity(String processIdentity) { - this.processIdentity = processIdentity; - } - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public List getProcessStatusList() { - return processStatusList; - } - - public void setProcessStatusList(List processStatusList) { - this.processStatusList = processStatusList; - } - - public List getDeployerNames() { - return deployerNames; - } - - public void setDeployerNames(List deployerNames) { - this.deployerNames = deployerNames; - } - - public List getDeployerUnitNames() { - return deployerUnitNames; - } - - public void setDeployerUnitNames(List deployerUnitNames) { - this.deployerUnitNames = deployerUnitNames; - } - - public List getDeployerTopUnitNames() { - return deployerTopUnitNames; - } - - public void setDeployerTopUnitNames(List deployerTopUnitNames) { - this.deployerTopUnitNames = deployerTopUnitNames; - } - - public String getQuery_creatorName() { - return query_creatorName; - } - - public void setQuery_creatorName(String query_creatorName) { - this.query_creatorName = query_creatorName; - } - - public String getQuery_creatorUnitName() { - return query_creatorUnitName; - } - - public void setQuery_creatorUnitName(String query_creatorUnitName) { - this.query_creatorUnitName = query_creatorUnitName; - } - - public String getQuery_creatorTopUnitName() { - return query_creatorTopUnitName; - } - - public void setQuery_creatorTopUnitName(String query_creatorTopUnitName) { - this.query_creatorTopUnitName = query_creatorTopUnitName; - } - - public List getCreatorNames() { - return creatorNames; - } - - public void setCreatorNames(List creatorNames) { - this.creatorNames = creatorNames; - } - - public List getCreatorUnitNames() { - return creatorUnitNames; - } - - public void setCreatorUnitNames(List creatorUnitNames) { - this.creatorUnitNames = creatorUnitNames; - } - - public List getCreatorTopUnitNames() { - return creatorTopUnitNames; - } - - public void setCreatorTopUnitNames(List creatorTopUnitNames) { - this.creatorTopUnitNames = creatorTopUnitNames; - } - - public String getSequenceField() { - return sequenceField; - } - - public void setSequenceField(String sequenceField) { - this.sequenceField = sequenceField; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public List getQ_statuses() { - return q_statuses; - } - - public void setQ_statuses(List q_statuses) { - this.q_statuses = q_statuses; - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryInfoStatus( String status ) { - if( q_statuses == null ){ - q_statuses = new ArrayList(); - } - if( !q_statuses.contains( status )){ - q_statuses.add( status ); - } - } - - /** - * 添加查询的信息状态 - * @param status - */ - public void addQueryProcessStatus( String status ) { - if( processStatusList == null ){ - processStatusList = new ArrayList(); - } - if( !processStatusList.contains( status )){ - processStatusList.add( status ); - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseInfoEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseInfoEmpty.java deleted file mode 100644 index ee0321b60f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseInfoEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAdminSuperviseInfoEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAdminSuperviseInfoEmpty() { - super("管理员督办信息为空，无法继续保存汇报信息。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseSave.java deleted file mode 100644 index b524984cf1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionAdminSuperviseSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionAdminSuperviseSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionAdminSuperviseSave( Throwable e, String id ) { - super("系统保存管理员督办信息时发生异常。ID:" + id, e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkNotExists.java deleted file mode 100644 index ff257f9a67..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkNotExists( String id ) { - super("指定ID的中心工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkQueryById.java deleted file mode 100644 index be9c19a413..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionCenterWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionCenterWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionCenterWorkQueryById( Throwable e, String id ) { - super("查询指定ID的中心工作信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionGetOkrUserCache.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionGetOkrUserCache.java deleted file mode 100644 index fcc09624aa..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionGetOkrUserCache.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionGetOkrUserCache extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionGetOkrUserCache( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public ExceptionGetOkrUserCache( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionEmpty.java deleted file mode 100644 index 08ffd08777..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionLeaderOpinionEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionLeaderOpinionEmpty() { - super("领导审批意见为空，无法继续保存汇报信息。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSave.java deleted file mode 100644 index 4ba563159f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionLeaderOpinionSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionLeaderOpinionSave( Throwable e, String id ) { - super("系统为工作汇报保存领导审批意见时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSubmit.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSubmit.java deleted file mode 100644 index 3f3fb5b4e8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionLeaderOpinionSubmit.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionLeaderOpinionSubmit extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionLeaderOpinionSubmit( Throwable e, String id ) { - super("系统为工作汇报处理领导审批意见时发生异常。ID:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionReportProcessLogList.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionReportProcessLogList.java deleted file mode 100644 index b5d4bbedcb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionReportProcessLogList.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogList extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogList( Throwable e, String id ) { - super("系统根据指定工作汇报ID查询汇报所有的处理记录列表时发生异常。ReportId：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionSystemConfigQueryByCode.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionSystemConfigQueryByCode.java deleted file mode 100644 index 35bf165e39..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionSystemConfigQueryByCode.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionSystemConfigQueryByCode extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionSystemConfigQueryByCode( Throwable e, String code ) { - super("根据指定的Code查询系统配置时发生异常。Code:" + code, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserNoLogin.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserNoLogin.java deleted file mode 100644 index 1127005ee2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserNoLogin.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserNoLogin extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserNoLogin( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserUnitQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserUnitQuery.java deleted file mode 100644 index 474b7a74cf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionUserUnitQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionUserUnitQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionUserUnitQuery( Throwable e, String userName ) { - super("系统通过操作用户查询用户身份和组织信息时发生异常!Person:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkIdEmpty.java deleted file mode 100644 index 431425ec5b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkIdEmpty() { - super("工作ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkNotExists.java deleted file mode 100644 index 58ba5e9081..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkNotExists( String id ) { - super("指定ID的具体工作信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkQueryById.java deleted file mode 100644 index 0538100677..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkQueryById( Throwable e, String id ) { - super("查询指定ID的具体工作信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportAdminProcess.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportAdminProcess.java deleted file mode 100644 index 86cecff5e2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportAdminProcess.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportAdminProcess extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportAdminProcess( Throwable e, String id ) { - super("工作汇报信息督办员处理时发生异常。ReportId：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDelete.java deleted file mode 100644 index d570ea33e9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportDelete( Throwable e, String id ) { - super("删除指定ID的工作汇报信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDetailQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDetailQueryById.java deleted file mode 100644 index 49724a1574..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDetailQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportDetailQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportDetailQueryById( Throwable e, String id ) { - super("查询指定ID的工作汇报详细信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDispatchOver.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDispatchOver.java deleted file mode 100644 index c060203f85..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDispatchOver.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportDispatchOver extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportDispatchOver( Throwable e, String id ) { - super("将指定ID的工作汇报信息调度至结束时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDraftSubmit.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDraftSubmit.java deleted file mode 100644 index 9421ed826d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportDraftSubmit.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportDraftSubmit extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportDraftSubmit( Throwable e ) { - super("系统在提交工作汇报草稿信息时发生异常.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportFilter.java deleted file mode 100644 index f8d43711e8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportFilter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportFilter extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportFilter( Throwable e ) { - super("系统根据条件查询工作汇报信息列表时发生异常." , e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportIdEmpty.java deleted file mode 100644 index 6c004716d4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportIdEmpty() { - super("工作汇报ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportLeaderSubmit.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportLeaderSubmit.java deleted file mode 100644 index 1b3821f5d8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportLeaderSubmit.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportLeaderSubmit extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportLeaderSubmit( Throwable e, String id ) { - super("工作汇报信息领导批阅处理时发生异常。ReportId：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportListByWorkId.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportListByWorkId.java deleted file mode 100644 index 497077b43b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportListByWorkId.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportListByWorkId extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportListByWorkId( Throwable e, String id ) { - super("根据指定的工作ID查询工作汇报信息时发生异常。WorkId：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportMaxReportCountQuery.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportMaxReportCountQuery.java deleted file mode 100644 index 94fe1d31ed..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportMaxReportCountQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportMaxReportCountQuery extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportMaxReportCountQuery( Throwable e, String id ) { - super("系统根据工作ID获取最大汇报次序发生异常。WorkId：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportNotExists.java deleted file mode 100644 index a30467c044..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportNotExists( String id ) { - super("指定ID的工作汇报信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportQueryById.java deleted file mode 100644 index 892bd62d5f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportQueryById( Throwable e, String id ) { - super("查询指定ID的工作汇报信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSave.java deleted file mode 100644 index b08862318f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportSave( Throwable e ) { - super("系统在保存工作汇报信息时发生异常.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSubmit.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSubmit.java deleted file mode 100644 index 629b4a0ca8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportSubmit.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportSubmit extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportSubmit( Throwable e, String id ) { - super("系统在提交工作汇报信息时发生异常.ReportId:" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportWrapOut.java deleted file mode 100644 index bdbd79e2ac..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWorkReportWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWorkReportWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWorkReportWrapOut( Throwable e ) { - super("将查询结果转换为可输出的数据信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 454739ca1f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionDelete.java deleted file mode 100644 index 6311250e1b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionDelete.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionReportDetailDelete; -import com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionReportDetailIdEmpty; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDelete.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionReportDetailIdEmpty(); - result.error( exception ); - }else{ - try{ - okrWorkReportDetailInfoService.delete( id ); - result.setData( new Wo( id )); - }catch(Exception e){ - Exception exception = new ExceptionReportDetailDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionGet.java deleted file mode 100644 index 875716802a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionGet.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionReportDetailIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionReportDetailNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionReportDetailQueryById; -import com.x.okr.entity.OkrWorkReportDetailInfo; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionReportDetailIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get( id ); - if( okrWorkReportDetailInfo != null ){ - wrap = Wo.copier.copy( okrWorkReportDetailInfo ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionReportDetailNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionReportDetailQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrWorkReportDetailInfo{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkReportDetailInfo.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionSave.java deleted file mode 100644 index 576fcc8437..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/ActionSave.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionReportDetailSave; -import com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrWorkReportDetailInfo; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.save( wrapIn ); - result.setData( new Wo( okrWorkReportDetailInfo.getId() ) ); - } catch (Exception e) { - Exception exception = new ExceptionReportDetailSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrWorkReportDetailInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - } - - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/BaseAction.java deleted file mode 100644 index dc77c1fc15..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/BaseAction.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrWorkReportDetailInfoService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkReportDetailInfoService okrWorkReportDetailInfoService = new OkrWorkReportDetailInfoService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/OkrWorkReportDetailInfoAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/OkrWorkReportDetailInfoAction.java deleted file mode 100644 index 464cb12662..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/OkrWorkReportDetailInfoAction.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrworkreportdetailinfo") -@JaxrsDescribe("工作汇报详细信息管理服务") -public class OkrWorkReportDetailInfoAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger(OkrWorkReportDetailInfoAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作汇报详细信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void post(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作汇报详细信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报详细信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailDelete.java deleted file mode 100644 index 36e116843e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailDelete( Throwable e, String id ) { - super("删除指定ID的工作汇报详细信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailIdEmpty.java deleted file mode 100644 index 631f385f01..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailIdEmpty() { - super("工作汇报ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailNotExists.java deleted file mode 100644 index 69da71f49c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailNotExists( String id ) { - super("指定ID的工作汇报详细信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailQueryById.java deleted file mode 100644 index 43373042a5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailQueryById( Throwable e, String id ) { - super("查询指定ID的工作汇报详细信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailSave.java deleted file mode 100644 index 3c94f765ea..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailSave( Throwable e ) { - super("工作汇报详细信息保存时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailWrapOut.java deleted file mode 100644 index c1d9751608..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionReportDetailWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailWrapOut( Throwable e ) { - super("将查询结果转换为可输出的数据信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionWrapInConvert.java deleted file mode 100644 index c390c24c61..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportdetailinfo/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionDelete.java deleted file mode 100644 index 6f1c2350bd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionDelete.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception.ExceptionReportPersonLinkDelete; -import com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception.ExceptionReportPersonLinkIdEmpty; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDelete.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionReportPersonLinkIdEmpty(); - result.error( exception ); - }else{ - try{ - okrWorkReportPersonLinkService.delete( id ); - result.setData( new Wo( id ) ); - }catch(Exception e){ - Exception exception = new ExceptionReportPersonLinkDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionGet.java deleted file mode 100644 index 74bce7ce05..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionGet.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception.ExceptionReportPersonLinkIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception.ExceptionReportPersonLinkNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception.ExceptionReportPersonLinkQueryById; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionReportPersonLinkIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkReportPersonLink = okrWorkReportPersonLinkService.get( id ); - if( okrWorkReportPersonLink != null ){ - wrap = Wo.copier.copy( okrWorkReportPersonLink ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionReportPersonLinkNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionReportPersonLinkQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrWorkReportPersonLink{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkReportPersonLink.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionSave.java deleted file mode 100644 index 019a3dec9b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/ActionSave.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception.ExceptionReportPersonLinkSave; -import com.x.okr.entity.OkrWorkReportPersonLink; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - okrWorkReportPersonLink = okrWorkReportPersonLinkService.save( wrapIn ); - result.setData( new Wo( okrWorkReportPersonLink.getId() ) ); - } catch (Exception e) { - Exception exception = new ExceptionReportPersonLinkSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wi extends OkrWorkReportPersonLink { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/BaseAction.java deleted file mode 100644 index 332312987a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/BaseAction.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrWorkReportPersonLinkService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/OkrWorkReportPersonLinkAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/OkrWorkReportPersonLinkAction.java deleted file mode 100644 index 634b66d716..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/OkrWorkReportPersonLinkAction.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrworkreportpersonlink") -@JaxrsDescribe("工作汇报处理者信息管理服务") -public class OkrWorkReportPersonLinkAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkReportPersonLinkAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作汇报处理者信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void post(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ActionSave got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作汇报处理者信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报处理者信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ActionDelete got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报处理者信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报处理者信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteGet got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportDetailWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportDetailWrapOut.java deleted file mode 100644 index 0533eae8e9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportDetailWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportDetailWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportDetailWrapOut( Throwable e ) { - super("将查询结果转换为可输出的数据信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkDelete.java deleted file mode 100644 index 9afffa99ff..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportPersonLinkDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportPersonLinkDelete( Throwable e, String id ) { - super("删除指定ID的工作汇报处理人信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkIdEmpty.java deleted file mode 100644 index 636494c5e7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportPersonLinkIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportPersonLinkIdEmpty() { - super("工作汇报处理人ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkNotExists.java deleted file mode 100644 index f97d09a640..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportPersonLinkNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportPersonLinkNotExists( String id ) { - super("指定ID的工作汇报处理人信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkQueryById.java deleted file mode 100644 index d84fffd125..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportPersonLinkQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportPersonLinkQueryById( Throwable e, String id ) { - super("查询指定ID的工作汇报处理人信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkSave.java deleted file mode 100644 index 857a42119c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionReportPersonLinkSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportPersonLinkSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportPersonLinkSave( Throwable e ) { - super("工作汇报处理人信息保存时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionWrapInConvert.java deleted file mode 100644 index 0d88f2e37d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportpersonlink/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportpersonlink.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionDelete.java deleted file mode 100644 index 863debc6d6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionDelete.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception.ExceptionReportProcessLogDelete; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception.ExceptionReportProcessLogIdEmpty; - -public class ActionDelete extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDelete.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionReportProcessLogIdEmpty(); - result.error( exception ); - }else{ - try{ - okrWorkReportProcessLogService.delete( id ); - result.setData( new Wo( id ) ); - }catch(Exception e){ - Exception exception = new ExceptionReportProcessLogDelete( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionGet.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionGet.java deleted file mode 100644 index 4524ee2b39..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionGet.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception.ExceptionReportProcessLogIdEmpty; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception.ExceptionReportProcessLogNotExists; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception.ExceptionReportProcessLogQueryById; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionGet.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, String id ) throws Exception { - ActionResult result = new ActionResult<>(); - Wo wrap = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - - if( id == null || id.isEmpty() ){ - Exception exception = new ExceptionReportProcessLogIdEmpty(); - result.error( exception ); - }else{ - try { - okrWorkReportProcessLog = okrWorkReportProcessLogService.get( id ); - if( okrWorkReportProcessLog != null ){ - wrap = Wo.copier.copy( okrWorkReportProcessLog ); - result.setData(wrap); - }else{ - Exception exception = new ExceptionReportProcessLogNotExists( id ); - result.error( exception ); - } - } catch (Exception e) { - Exception exception = new ExceptionReportProcessLogQueryById( e, id ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class Wo extends OkrWorkReportProcessLog{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( OkrWorkReportProcessLog.class, Wo.class, null, JpaObject.FieldsInvisible); - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionSave.java deleted file mode 100644 index 347a4a2d75..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/ActionSave.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.control.jaxrs.okrworkreportdetailinfo.exception.ExceptionWrapInConvert; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception.ExceptionReportProcessLogSave; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ActionSave extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - - protected ActionResult execute( HttpServletRequest request,EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - WrapInOkrWorkReportProcessLog wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, WrapInOkrWorkReportProcessLog.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - if( check ){ - try { - okrWorkReportProcessLog = okrWorkReportProcessLogService.save( wrapIn ); - result.setData( new Wo( okrWorkReportProcessLog.getId() ) ); - } catch (Exception e) { - Exception exception = new ExceptionReportProcessLogSave( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - - public static class WrapInOkrWorkReportProcessLog extends OkrWorkReportProcessLog { - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - } - - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/BaseAction.java deleted file mode 100644 index 0f23acc06f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/BaseAction.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.service.OkrWorkReportProcessLogService; - -public class BaseAction extends StandardJaxrsAction { - - protected OkrWorkReportProcessLogService okrWorkReportProcessLogService = new OkrWorkReportProcessLogService(); - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/OkrWorkReportProcessLogAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/OkrWorkReportProcessLogAction.java deleted file mode 100644 index f1402d88a0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/OkrWorkReportProcessLogAction.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("okrworkreportprocesslog") -@JaxrsDescribe("工作汇报处理日志信息管理服务") -public class OkrWorkReportProcessLogAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkReportProcessLogAction.class); - - @JaxrsMethodDescribe(value = "新建或者更新工作汇报处理日志信息", action = ActionSave.class) - @POST - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void post(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionSave().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ActionSave got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID删除工作汇报处理日志信息", action = ActionDelete.class) - @DELETE - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报处理日志信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionDelete().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ActionSave got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据ID获取工作汇报处理日志信息", action = ActionGet.class) - @GET - @Path("{id}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作汇报处理日志信息ID") @PathParam("id") String id) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionGet().execute(request, effectivePerson, id); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ActionSave got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogDelete.java deleted file mode 100644 index a87d74a442..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogDelete.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogDelete extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogDelete( Throwable e, String id ) { - super("删除指定ID的工作汇报处理人信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogIdEmpty.java deleted file mode 100644 index e1b7fcdbc8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogIdEmpty() { - super("工作汇报处理人ID为空。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogNotExists.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogNotExists.java deleted file mode 100644 index 0f32586e3c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogNotExists.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogNotExists extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogNotExists( String id ) { - super("指定ID的工作汇报处理人信息记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogQueryById.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogQueryById.java deleted file mode 100644 index d78bbc717b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogQueryById.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogQueryById extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogQueryById( Throwable e, String id ) { - super("查询指定ID的工作汇报处理人信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogSave.java deleted file mode 100644 index d8770df2bb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogSave.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogSave extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogSave( Throwable e ) { - super("工作汇报处理人信息保存时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogWrapOut.java deleted file mode 100644 index 8330d6e4ea..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionReportProcessLogWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportProcessLogWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportProcessLogWrapOut( Throwable e ) { - super("将查询结果转换为可输出的数据信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionWrapInConvert.java deleted file mode 100644 index d62e410621..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportprocesslog/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/QueueWorkDynamicRecord.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/QueueWorkDynamicRecord.java deleted file mode 100644 index a4e4e5d8ca..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/QueueWorkDynamicRecord.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.queue; - -import java.util.Date; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.queue.AbstractQueue; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.entity.OkrWorkDynamics; - -public class QueueWorkDynamicRecord extends AbstractQueue { - - private static Logger logger = LoggerFactory.getLogger( QueueWorkDynamicRecord.class ); - - DateOperation dateOperation = new DateOperation(); - - public void execute( WrapInWorkDynamic wrapIn ) throws Exception { - OkrWorkDynamics okrWorkDynamics = new OkrWorkDynamics(); - wrapIn.copyTo( okrWorkDynamics ); - okrWorkDynamics.setDateTime( new Date() ); - okrWorkDynamics.setDateTimeStr( dateOperation.getNowDateTime() ); - - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - emc.beginTransaction( OkrWorkDynamics.class ); - emc.persist( okrWorkDynamics, CheckPersistType.all ); - emc.commit(); - }catch( Exception e ){ - logger.error( e ); - } - - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/WrapInWorkDynamic.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/WrapInWorkDynamic.java deleted file mode 100644 index 3381090de4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/queue/WrapInWorkDynamic.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.queue; - -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrConfigSecretary; -import com.x.okr.entity.OkrConfigSystem; -import com.x.okr.entity.OkrConfigWorkLevel; -import com.x.okr.entity.OkrConfigWorkType; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class WrapInWorkDynamic extends OkrWorkDynamics { - - private static final long serialVersionUID = 1L; - - private String dynamicInfoType = null; - - public String getDynamicInfoType() { - return dynamicInfoType; - } - - public void setDynamicInfoType(String dynamicInfoType) { - this.dynamicInfoType = dynamicInfoType; - } - - public static void sendWithCenterWorkInfo( OkrCenterWorkInfo okrCenterWorkInfo, - String distinguishedName, String loginUserName, String loginIdentityName, String dynamicType, String description) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setDynamicObjectId( okrCenterWorkInfo.getId() ); - o.setDynamicObjectTitle( okrCenterWorkInfo.getTitle() ); - o.setDynamicObjectType( "中心工作" ); - o.setCenterId( okrCenterWorkInfo.getId() ); - o.setCenterTitle( okrCenterWorkInfo.getTitle() ); - o.setWorkId( null ); - o.setWorkTitle( null ); - o.setContent( dynamicType + ":" + okrCenterWorkInfo.getTitle() ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDynamicType( dynamicType ); - o.setDescription( description ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithWorkInfo( OkrWorkBaseInfo okrWorkBaseInfo, - String distinguishedName, String loginUserName, String loginIdentityName, String dynamicType, String description ) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setDynamicObjectId( okrWorkBaseInfo.getId() ); - o.setDynamicObjectTitle( okrWorkBaseInfo.getTitle() ); - o.setDynamicObjectType( "具体工作信息" ); - o.setCenterId( okrWorkBaseInfo.getCenterId() ); - o.setCenterTitle( okrWorkBaseInfo.getCenterTitle() ); - o.setWorkId( okrWorkBaseInfo.getId() ); - o.setWorkTitle( okrWorkBaseInfo.getTitle() ); - o.setContent( dynamicType + ":" + okrWorkBaseInfo.getTitle() ); - o.setDynamicType( dynamicType ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithSecretaryConfig(OkrConfigSecretary okrConfigSecretary, - String distinguishedName, String loginUserName, String loginIdentityName, String dynamicType, String description ) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setDynamicObjectId( okrConfigSecretary.getId() ); - o.setDynamicObjectTitle( okrConfigSecretary.getLeaderName() ); - o.setDynamicObjectType( "领导秘书配置" ); - o.setContent( dynamicType + ":设置领导[" + okrConfigSecretary.getLeaderIdentity() + "]秘书为：" + okrConfigSecretary.getSecretaryIdentity() ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithSystemConfig( OkrConfigSystem okrConfigSystem, String distinguishedName, - String loginUserName, String loginIdentityName, String dynamicType, String description ) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setDynamicObjectId( okrConfigSystem.getId() ); - o.setDynamicObjectTitle( okrConfigSystem.getConfigCode() ); - o.setDynamicObjectType( "系统配置" ); - o.setContent( dynamicType + ":" + okrConfigSystem.getConfigCode() + "["+ okrConfigSystem.getConfigName()+"] = " + okrConfigSystem.getConfigValue() ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithConfigWorkLevel( OkrConfigWorkLevel okrConfigWorkLevel, String distinguishedName, - String loginUserName, String loginIdentityName, String dynamicType, String description ) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setDynamicObjectId( okrConfigWorkLevel.getId() ); - o.setDynamicObjectTitle( okrConfigWorkLevel.getWorkLevelName() ); - o.setDynamicObjectType( "工作级别配置" ); - o.setContent( dynamicType + ":" + okrConfigWorkLevel.getWorkLevelName() ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithConfigWorkType(OkrConfigWorkType okrConfigWorkType, String distinguishedName, - String loginUserName, String loginIdentityName, String dynamicType, String description ) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setDynamicObjectId( okrConfigWorkType.getId() ); - o.setDynamicObjectTitle( okrConfigWorkType.getWorkTypeName() ); - o.setDynamicObjectType( "工作类别配置" ); - o.setContent( dynamicType + ":" + okrConfigWorkType.getWorkTypeName() ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithWorkChat(OkrWorkChat okrWorkChat, String distinguishedName, String loginUserName, - String loginIdentityName, String dynamicType, String description) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setCenterId( okrWorkChat.getCenterId() ); - o.setCenterTitle( okrWorkChat.getCenterTitle() ); - o.setWorkId( okrWorkChat.getWorkId() ); - o.setWorkTitle( okrWorkChat.getWorkTitle() ); - o.setDynamicObjectId( okrWorkChat.getId() ); - o.setDynamicObjectTitle( okrWorkChat.getTargetIdentity() ); - o.setDynamicObjectType( "工作交流信息" ); - o.setContent( dynamicType + ":[" + okrWorkChat.getSenderIdentity() + "]发送给[" + okrWorkChat.getTargetIdentity() + "]:“" + okrWorkChat.getContent() +"”" ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithWorkReport(OkrWorkReportBaseInfo okrWorkReportBaseInfo, String distinguishedName, - String loginUserName, String loginIdentityName, String dynamicType, String description) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - o.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - o.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - o.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle() ); - o.setDynamicObjectId( okrWorkReportBaseInfo.getId() ); - o.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle() ); - o.setDynamicObjectType( "工作汇报信息" ); - o.setContent( dynamicType + ":" + okrWorkReportBaseInfo.getTitle() + "[" +okrWorkReportBaseInfo.getActivityName()+ "]" ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithTask(OkrTask okrTask, String distinguishedName, String loginUserName, - String loginIdentityName, String dynamicType, String description) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setCenterId( okrTask.getCenterId() ); - o.setCenterTitle( okrTask.getCenterTitle() ); - o.setWorkId( okrTask.getWorkId() ); - o.setWorkTitle( okrTask.getWorkTitle() ); - o.setDynamicObjectId( okrTask.getId() ); - o.setDynamicObjectTitle( okrTask.getTitle() ); - o.setDynamicObjectType( "工作汇报信息" ); - o.setContent( dynamicType + ":" + okrTask.getTitle() + "[" +okrTask.getActivityName()+ "]" ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - - public static void sendWithTaskHandled(OkrTaskHandled okrTaskHandled, String distinguishedName, - String loginUserName, String loginIdentityName, String dynamicType, String description) throws Exception { - WrapInWorkDynamic o = new WrapInWorkDynamic(); - o.setCenterId( okrTaskHandled.getCenterId() ); - o.setCenterTitle( okrTaskHandled.getCenterTitle() ); - o.setWorkId( okrTaskHandled.getWorkId() ); - o.setWorkTitle( okrTaskHandled.getWorkTitle() ); - o.setDynamicObjectId( okrTaskHandled.getId() ); - o.setDynamicObjectTitle( okrTaskHandled.getTitle() ); - o.setDynamicObjectType( "工作汇报信息" ); - o.setContent( dynamicType + ":" + okrTaskHandled.getTitle() + "[" +okrTaskHandled.getActivityName()+ "]" ); - o.setOperatorName( distinguishedName ); - o.setTargetName( loginUserName ); - o.setTargetIdentity( loginIdentityName ); - o.setDescription( description ); - o.setDynamicType( dynamicType ); - ThisApplication.queueWorkDynamicRecord.send( o ); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionDateList.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionDateList.java deleted file mode 100644 index 22d2a40f35..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionDateList.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryEndDateInvalid; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryStartDateInvalid; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryWithCondition; -import org.apache.commons.lang3.StringUtils; - -public class ActionDateList extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionDateList.class); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, WrapInFilterOkrStatisticReportContent wrapIn) throws Exception { - ActionResult> result = new ActionResult<>(); - List result_datetimes = new ArrayList<>(); - List datetimes = null; - Integer year = null; - Integer month = null; - Integer week = null; - String reportCycle = null; - String centerId = null; - String order = "DESC"; - Date startDate = null; - Date endDate = null; - Boolean check = true; - DateOperation dateOperation = new DateOperation(); - - if (check) { - order = wrapIn.getOrder(); - centerId = wrapIn.getCenterId(); - year = wrapIn.getYear(); - month = wrapIn.getMonth(); - week = wrapIn.getWeek(); - reportCycle = wrapIn.getReportCycle(); - } - if (check) { - if ( StringUtils.isNotEmpty( wrapIn.getStartDate() )) { - try { - startDate = dateOperation.getDateFromString( wrapIn.getStartDate() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryStartDateInvalid( e, wrapIn.getStartDate() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if ( StringUtils.isNotEmpty( wrapIn.getEndDate())) { - try { - endDate = dateOperation.getDateFromString( wrapIn.getEndDate() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryEndDateInvalid( e, wrapIn.getEndDate() ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if (check) { - try { - if( StringUtils.isNotEmpty(reportCycle) ){ - datetimes = okrCenterWorkReportStatisticService.listDateTimeFlags( centerId, wrapIn.getCenterTitle(), null, wrapIn.getWorkTypeName(), "每周汇报", year, month, week, startDate, endDate, wrapIn.getStatus() ); - if( datetimes != null && !datetimes.isEmpty() ){ - for( String datetime : datetimes){ - result_datetimes.add( new WoOkrReportSubmitStatusDate( datetime, "每周汇报")); - } - } - datetimes = okrCenterWorkReportStatisticService.listDateTimeFlags( centerId, wrapIn.getCenterTitle(), null, wrapIn.getWorkTypeName(), "每月汇报", year, month, week, startDate, endDate, wrapIn.getStatus() ); - if( datetimes != null && !datetimes.isEmpty() ){ - for( String datetime : datetimes){ - result_datetimes.add( new WoOkrReportSubmitStatusDate( datetime, "每月汇报")); - } - } - }else{ - datetimes = okrCenterWorkReportStatisticService.listDateTimeFlags( centerId, wrapIn.getCenterTitle(), null, wrapIn.getWorkTypeName(), reportCycle, year, month, week, startDate, endDate, wrapIn.getStatus() ); - if( datetimes != null && !datetimes.isEmpty() ){ - for( String datetime : datetimes){ - result_datetimes.add( new WoOkrReportSubmitStatusDate( datetime, reportCycle )); - } - } - } - if ( result_datetimes != null) { - if ("DESC".equals( order.toUpperCase()) ) { - SortTools.desc(result_datetimes, "datetime"); - } else { - SortTools.asc(result_datetimes, "datetime"); - } - } - result.setData( result_datetimes ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryWithCondition( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterExport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterExport.java deleted file mode 100644 index 44133148bd..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterExport.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.schedule.entity.WorkReportProcessOpinionEntity; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionFilterExport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionFilterExport.class ); - - public List execute( HttpServletRequest request, EffectivePerson effectivePerson, String reportCycle, String centerId, String centerTitle, String workType, String statisticTimeFlag, String status ) { - List ids = null; - List wraps_centers = new ArrayList<>(); - List opinions = null; - List okrStatisticReportContentList = null; - WoOkrStatisticReportContentCenter wrap_center = null; - WoOkrStatisticReportContent wrap = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - Integer year = null; - Integer month = null; - Integer week = null; - String opinionContent = null; - Boolean hasSubWork = false; - Boolean check = true; - Gson gson = XGsonBuilder.instance(); - - if( check ){ - try { - ids = okrCenterWorkReportStatisticService.listFirstLayer( centerId, centerTitle, null, workType, statisticTimeFlag, reportCycle, year, month, week, status ); - } catch (Exception e) { - check = false; - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrStatisticReportContentList = okrCenterWorkReportStatisticService.list( ids ); - } catch (Exception e) { - check = false; - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( okrStatisticReportContentList != null ){ - for( OkrStatisticReportContent okrStatisticReportContent : okrStatisticReportContentList ){ - if( okrStatisticReportContent.getParentId() != null && !okrStatisticReportContent.getParentId().isEmpty() ){ - continue; - } - wrap_center = null; - try { - wrap = WoOkrStatisticReportContent.copier.copy( okrStatisticReportContent ); - opinionContent = wrap.getOpinion(); - if( opinionContent != null && !"{}".equals( opinionContent )){ - opinions = gson.fromJson( opinionContent, new TypeToken>(){}.getType() ); - wrap.setOpinions( opinions ); - } - wrap_center = getContentFormCenterList( okrStatisticReportContent.getCenterId(), wraps_centers ); - if( wrap_center == null ){ - wrap_center = new WoOkrStatisticReportContentCenter(); - wrap_center.setId( okrStatisticReportContent.getCenterId() ); - wrap_center.setTitle( okrStatisticReportContent.getCenterTitle() ); - wraps_centers.add( wrap_center ); - if( wrap_center.getContents() == null ){ - wrap_center.setContents( new ArrayList<>() ); - } - } - - wrap_center.countAdd( 1 ); - wrap.setId( null ); - wrap.setCenterId( null ); - wrap.setCenterTitle( null ); - wrap.setCreateTime( null ); - wrap.setUpdateTime( null ); - wrap.setSequence( null ); - wrap.setParentId( null ); - wrap.setWorkLevel( null ); - wrap.setStatisticTime( null ); - wrap.setStatisticYear( null ); - wrap.setStatisticMonth( null ); - wrap.setStatisticWeek( null ); - wrap.setStatus( null ); - wrap.setOpinion( null ); - wrap.setDistributeFactor( null ); - - okrWorkDetailInfo = okrWorkDetailInfoService.get( wrap.getWorkId() ); - if( okrWorkDetailInfo != null ){ - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - } - //查询该工作下面是否还有下级工作 - hasSubWork = okrWorkBaseInfoQueryService.hasSubWork( wrap.getWorkId() ); - wrap.setHasSubWork(hasSubWork); - wrap_center.getContents().add( wrap ); - } catch (Exception e) { - check = false; - logger.warn( "system copy object to wrap got an exception." ); - logger.error(e); - } - } - for( WoOkrStatisticReportContentCenter temp : wraps_centers ){ - if( temp.getContents() != null ){ - try { - SortTools.desc( temp.getContents(), "workTitle" ); - } catch (Exception e) { - logger.warn( "system sort wrap list got an exception." ); - logger.error(e); - } - } - } - wraps_centers = composeWorkInCenter( wraps_centers, centerTitle, workType,statisticTimeFlag, reportCycle, year, month, week, status ); - } - } - return wraps_centers; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterList.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterList.java deleted file mode 100644 index a38c6d6d82..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterList.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionReportStatisitcList; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionReportStatisitcListWithIds; -import com.x.okr.assemble.control.schedule.entity.WorkReportProcessOpinionEntity; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionFilterList extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionFilterList.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, WrapInFilterOkrStatisticReportContent wrapIn, Boolean isTree ) throws Exception { - ActionResult> result = new ActionResult<>(); - List ids = null; - List wraps_centers = new ArrayList<>(); - List opinions = null; - List okrStatisticReportContentList = null; - WoOkrStatisticReportContentCenter wrap_center = null; - WoOkrStatisticReportContent wrap = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - Integer year = null; - Integer month = null; - Integer week = null; - String opinionContent = null; - String reportCycle = null; - String centerId = null; - String statisticTimeFlag = null; - Boolean hasSubWork = false; - Boolean check = true; - Gson gson = XGsonBuilder.instance(); - - if( check ){ - centerId = wrapIn.getCenterId(); - statisticTimeFlag = wrapIn.getStatisticTimeFlag(); - year = wrapIn.getYear(); - month = wrapIn.getMonth(); - week = wrapIn.getWeek(); - reportCycle = wrapIn.getReportCycle(); - } - - if( check ){ - try { - ids = okrCenterWorkReportStatisticService.listFirstLayer( centerId, wrapIn.getCenterTitle(), null, wrapIn.getWorkTypeName(), statisticTimeFlag, reportCycle, year, month, week, wrapIn.getStatus() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionReportStatisitcList( e ); - logger.error( e, effectivePerson, request, null); - result.error( exception ); - } - } - - if( check ){ - try { - okrStatisticReportContentList = okrCenterWorkReportStatisticService.list( ids ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionReportStatisitcListWithIds( e ); - logger.error( e, effectivePerson, request, null); - result.error( exception ); - } - } - - if( check ){ - if( okrStatisticReportContentList != null ){ - for( OkrStatisticReportContent okrStatisticReportContent : okrStatisticReportContentList ){ - if( okrStatisticReportContent.getParentId() != null && !okrStatisticReportContent.getParentId().isEmpty() ){ - continue; - } - wrap_center = null; - try { - wrap = WoOkrStatisticReportContent.copier.copy( okrStatisticReportContent ); - opinionContent = wrap.getOpinion(); - if( opinionContent != null && !"{}".equals( opinionContent )){ - opinions = gson.fromJson( opinionContent, new TypeToken>(){}.getType() ); - wrap.setOpinions( opinions ); - } - wrap_center = getContentFormCenterList( okrStatisticReportContent.getCenterId(), wraps_centers ); - if( wrap_center == null ){ - wrap_center = new WoOkrStatisticReportContentCenter(); - wrap_center.setId( okrStatisticReportContent.getCenterId() ); - wrap_center.setTitle( okrStatisticReportContent.getCenterTitle() ); - wraps_centers.add( wrap_center ); - if( wrap_center.getContents() == null ){ - wrap_center.setContents( new ArrayList<>() ); - } - } - - wrap_center.countAdd( 1 ); - - wrap.setId( null ); - wrap.setCenterId( null ); - wrap.setCenterTitle( null ); - wrap.setCreateTime( null ); - wrap.setUpdateTime( null ); - wrap.setSequence( null ); - wrap.setParentId( null ); - wrap.setWorkLevel( null ); - wrap.setStatisticTime( null ); - wrap.setStatisticYear( null ); - wrap.setStatisticMonth( null ); - wrap.setStatisticWeek( null ); - wrap.setStatus( null ); - wrap.setOpinion( null ); - wrap.setDistributeFactor( null ); - - okrWorkDetailInfo = okrWorkDetailInfoService.get( wrap.getWorkId() ); - if( okrWorkDetailInfo != null ){ - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - } - //查询该工作下面是否还有下级工作 - hasSubWork = okrWorkBaseInfoQueryService.hasSubWork( wrap.getWorkId() ); - wrap.setHasSubWork(hasSubWork); - wrap_center.getContents().add( wrap ); - } catch (Exception e) { - logger.warn( "system copy object to wrap got an exception." ); - logger.error(e); - } - } - for( WoOkrStatisticReportContentCenter temp : wraps_centers ){ - if( temp.getContents() != null ){ - try { - SortTools.desc( temp.getContents(), "workTitle" ); - } catch (Exception e) { - logger.warn( "system sort wrap list got an exception." ); - logger.error(e); - } - } - } - if( isTree ){ - wraps_centers = composeWorkTreeInCenter( wraps_centers, wrapIn.getCenterTitle(), wrapIn.getWorkTypeName(), statisticTimeFlag, reportCycle, year, month, week, null ); - }else{ - wraps_centers = composeWorkInCenter( wraps_centers, wrapIn.getCenterTitle(), wrapIn.getWorkTypeName(), statisticTimeFlag, reportCycle, year, month, week, null ); - } - result.setData( wraps_centers ); - } - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterSubList.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterSubList.java deleted file mode 100644 index 410c284ef1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionFilterSubList.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryParentIdEmpty; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryWithCondition; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionReportStatisitcListWithIds; -import com.x.okr.assemble.control.schedule.entity.WorkReportProcessOpinionEntity; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class ActionFilterSubList extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger( ActionFilterSubList.class ); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String parentId, WrapInFilterOkrStatisticReportContent wrapIn ) throws Exception { - ActionResult> result = new ActionResult<>(); - List ids = null; - List wraps_centers = new ArrayList<>(); - List opinions = null; - List okrStatisticReportContentList = null; - WoOkrStatisticReportContentCenter wrap_center = null; - WoOkrStatisticReportContent wrap = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - Integer year = null; - Integer month = null; - Integer week = null; - String opinionContent = null; - String reportCycle = null; - String centerId = null; - String statisticTimeFlag = null; - Boolean hasSubWork = false; - Boolean check = true; - Gson gson = XGsonBuilder.instance(); - - if( parentId == null || parentId.isEmpty() ){ - check = false; - Exception exception = new ExceptionQueryParentIdEmpty(); - result.error( exception ); - } - - if( check ){ - centerId = wrapIn.getCenterId(); - statisticTimeFlag = wrapIn.getStatisticTimeFlag(); - year = wrapIn.getYear(); - month = wrapIn.getMonth(); - week = wrapIn.getWeek(); - reportCycle = wrapIn.getReportCycle(); - } - - if( check ){ - try { - ids = okrCenterWorkReportStatisticService.list( centerId, wrapIn.getCenterTitle(), null, wrapIn.getWorkTypeName(), statisticTimeFlag, reportCycle, year, month, week, wrapIn.getStatus() ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryWithCondition( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - try { - okrStatisticReportContentList = okrCenterWorkReportStatisticService.list( ids ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionReportStatisitcListWithIds( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - - if( check ){ - if( okrStatisticReportContentList != null ){ - for( OkrStatisticReportContent okrStatisticReportContent : okrStatisticReportContentList ){ - if( okrStatisticReportContent.getParentId() != null && !okrStatisticReportContent.getParentId().isEmpty() ){ - continue; - } - wrap_center = null; - try { - wrap = WoOkrStatisticReportContent.copier.copy( okrStatisticReportContent ); - opinionContent = wrap.getOpinion(); - if( opinionContent != null && !"{}".equals( opinionContent )){ - opinions = gson.fromJson( opinionContent, new TypeToken>(){}.getType() ); - wrap.setOpinions( opinions ); - } - wrap_center = getContentFormCenterList( okrStatisticReportContent.getCenterId(), wraps_centers ); - if( wrap_center == null ){ - wrap_center = new WoOkrStatisticReportContentCenter(); - wrap_center.setId( okrStatisticReportContent.getCenterId() ); - wrap_center.setTitle( okrStatisticReportContent.getCenterTitle() ); - - wraps_centers.add( wrap_center ); - - if( wrap_center.getContents() == null ){ - wrap_center.setContents( new ArrayList<>() ); - } - } - wrap_center.countAdd( 1 ); - - wrap.setId( null ); - wrap.setCenterId( null ); - wrap.setCenterTitle( null ); - wrap.setCreateTime( null ); - wrap.setUpdateTime( null ); - wrap.setSequence( null ); - wrap.setParentId( null ); - wrap.setWorkLevel( null ); - wrap.setStatisticTime( null ); - wrap.setStatisticYear( null ); - wrap.setStatisticMonth( null ); - wrap.setStatisticWeek( null ); - wrap.setStatus( null ); - wrap.setOpinion( null ); - wrap.setDistributeFactor( null ); - - okrWorkDetailInfo = okrWorkDetailInfoService.get( wrap.getWorkId() ); - if( okrWorkDetailInfo != null ){ - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - } - - //查询该工作下面是否还有下级工作 - hasSubWork = okrWorkBaseInfoQueryService.hasSubWork( wrap.getWorkId() ); - wrap.setHasSubWork(hasSubWork); - - wrap_center.getContents().add( wrap ); - } catch (Exception e) { - logger.warn( "system copy object to wrap got an exception." ); - logger.error(e); - result.error( e ); - logger.error( e, effectivePerson, request, null); - } - } - try { - SortTools.desc( wraps_centers, "title" ); - } catch (Exception e) { - logger.warn( "system sort wrap list got an exception." ); - logger.error(e); - } - result.setData( wraps_centers ); - } - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculate.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculate.java deleted file mode 100644 index 0424303dc1..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculate.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.ExcuteSt_WorkReportContentService; - -public class ActionStReportContentCaculate extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportContentCaculate.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - new ExcuteSt_WorkReportContentService().execute(); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "OKR_St_WorkReportContent completed and excute got an exception." ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculateAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculateAll.java deleted file mode 100644 index 2d371668a7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentCaculateAll.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.ExcuteSt_WorkReportContentService; - -public class ActionStReportContentCaculateAll extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportContentCaculateAll.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - new ExcuteSt_WorkReportContentService().executeAll(); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "OKR_St_WorkReportContent completed and excute got an exception." ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentExport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentExport.java deleted file mode 100644 index 42e8d56960..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentExport.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.io.UnsupportedEncodingException; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.common.excel.writer.WorkReportContentExportExcelWriter; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; - -public class ActionStReportContentExport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportContentExport.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - String centerId = null; - String flag = null; - List exportDataList = null; - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - if( wrapIn == null ){ - wrapIn = new Wi(); - wrapIn.setCenterId("none"); - } - } - - if (check) { - try { - request.setCharacterEncoding("UTF-8"); - } catch (UnsupportedEncodingException e ) { - logger.warn( "system set character encoding for request got an exception. " ); - logger.error( e ); - } - } - if (check) { - if ("all".equals( centerId )) { - wrapIn.setCenterId( null ); - } - } - try { - exportDataList = new ActionFilterExport().execute( request, effectivePerson, wrapIn.getReportCycle(), wrapIn.getCenterId(), wrapIn.getCenterTitle(), wrapIn.getWorkTypeName(), wrapIn.getStatisticTimeFlag(), wrapIn.getStatus() ); - } catch (Exception e ) { - logger.warn( "system query data for export got an exception. " ); - logger.error( e ); - } - if ( check ) { - try { - flag = new WorkReportContentExportExcelWriter().writeExcel( exportDataList ); - result.setData( new Wo(flag) ); - } catch ( Exception e ) { - logger.warn( "system write export data to excel file got an exception. " ); - logger.error( e ); - } - } - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportContent { - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListByFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListByFilter.java deleted file mode 100644 index 650144950a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListByFilter.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; - -public class ActionStReportContentListByFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportContentListByFilter.class); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - Wi wrapIn = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null ); - } - - if( check ){ - try { - result = new ActionFilterList().execute( request, effectivePerson, wrapIn, false ); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "system excute ExcuteFilterList got an exception. " ); - logger.error( e ); - } - } - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportContent { - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListDateByFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListDateByFilter.java deleted file mode 100644 index e3db96d5a8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListDateByFilter.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; - -public class ActionStReportContentListDateByFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportContentListDateByFilter.class); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - result = new ActionDateList().execute( request, effectivePerson, wrapIn ); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "system excute ExcuteDateList got an exception. " ); - logger.error( e ); - } - } - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportContent { - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListSubByFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListSubByFilter.java deleted file mode 100644 index ce222dee8a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportContentListSubByFilter.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; - -public class ActionStReportContentListSubByFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportContentListSubByFilter.class); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String parentId, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - result = new ActionFilterSubList().execute( request, effectivePerson, parentId, wrapIn ); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "system excute ExcuteFilterSubList got an exception. " ); - logger.error( e ); - } - } - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportContent{ - - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculate.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculate.java deleted file mode 100644 index abb08bb5e3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculate.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.ExcuteSt_WorkReportStatusService; - -public class ActionStReportStatusCaculate extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportStatusCaculate.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - new ExcuteSt_WorkReportStatusService().execute(); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "ExcuteStReportStatusCaculate completed and excute got an exception." ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculateAll.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculateAll.java deleted file mode 100644 index dcf7ad34f5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusCaculateAll.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import javax.servlet.http.HttpServletRequest; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.ExcuteSt_WorkReportStatusService; - -public class ActionStReportStatusCaculateAll extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportStatusCaculateAll.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { - ActionResult result = new ActionResult<>(); - try { - new ExcuteSt_WorkReportStatusService().executeAll(); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "ExcuteStReportStatusCaculateAll completed and excute got an exception." ); - logger.error( e, effectivePerson, request, null); - } - return result; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusExport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusExport.java deleted file mode 100644 index 6d905b0e8e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusExport.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -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 com.x.okr.assemble.common.date.MonthOfYear; -import com.x.okr.assemble.common.date.WeekOfYear; -import com.x.okr.assemble.common.excel.writer.WorkReportStatusExportExcelWriter; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryEndDateEmpty; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryEndDateInvalid; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryStartDateEmpty; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryStartDateInvalid; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryWithCondition; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionReportStatisitcWrapOut; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrStatisticReportStatus; - -public class ActionStReportStatusExport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportStatusExport.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - - List wrapOutOkrReportSubmitStatusStatisticList = null; - List okrReportStatusStatisticList = null; - List unitNameLayer = null; - List headers = null; - List weeks = null; - List months = null; - Wi wrapIn = null; - WoOkrStatisticReportStatusTable wrapOutOkrReportSubmitStatusTable = new WoOkrStatisticReportStatusTable(); - Date startDate = null; - Date endDate = null; - String workTitle = null; - String startDateString = null; - String endDateString = null; - String workType = null; - String cycleType = "每周汇报"; - String centerId = null; - String workId = null; - String unitName = null; - String fileName = null; - String status = null; - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - startDateString = wrapIn.getStartDate(); - if( startDateString != null ){ - try { - startDate = dateOperation.getDateFromString( startDateString ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryStartDateInvalid( e, startDateString ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionQueryStartDateEmpty(); - result.error( exception ); - } - endDateString = wrapIn.getEndDate(); - if( endDateString != null ){ - try { - endDate = dateOperation.getDateFromString( endDateString ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryEndDateInvalid( e, endDateString ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionQueryEndDateEmpty(); - result.error( exception ); - } - } - if( check ){ - //查询过滤条件 - workTitle = wrapIn.getCenterTitle(); - workType = wrapIn.getWorkTypeName(); - cycleType = wrapIn.getCycleType(); - centerId = wrapIn.getCenterId(); - workId = wrapIn.getWorkId(); - unitName = wrapIn.getUnitName(); - status = wrapIn.getStatus(); - } - if( check ){ - try { - okrReportStatusStatisticList = okrReportStatusStatisticService.list( centerId, workTitle, workId, workType, unitName, cycleType, status ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryWithCondition( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrReportStatusStatisticList != null ){ - try { - wrapOutOkrReportSubmitStatusStatisticList = wrapout_copier.copy( okrReportStatusStatisticList ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionReportStatisitcWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if( "每月汇报".equals( cycleType ) ){ - months = dateOperation.getMonthsOfYear( startDate, endDate ); - headers = getHeaderForUnitMonthStatistic( months ); - unitNameLayer = getMonthFirstLayerArray( wrapOutOkrReportSubmitStatusStatisticList, months, startDate, endDate ); - }else{ - weeks = dateOperation.getWeeksOfYear( startDate, endDate ); - headers = getHeaderForUnitWeekStatistic( weeks ); - unitNameLayer = getWeekFirstLayerArray( wrapOutOkrReportSubmitStatusStatisticList, weeks, startDate, endDate ); - } - wrapOutOkrReportSubmitStatusTable.setHeader(headers); - wrapOutOkrReportSubmitStatusTable.setContent( unitNameLayer ); - - //将所有的数据组织成EXCEL文件 - if ( check ) { - try { - fileName = new WorkReportStatusExportExcelWriter().writeExcel( wrapOutOkrReportSubmitStatusTable ); - result.setData( new Wo( fileName ) ); - } catch ( Exception e ) { - logger.warn( "system write export data to excel file got an exception. " ); - logger.error( e ); - } - } - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportStatus { - } - - public static class Wo extends WoId { - public Wo( String id ) { - this.setId( id ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusListByFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusListByFilter.java deleted file mode 100644 index ccd8230af7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStReportStatusListByFilter.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.MonthOfYear; -import com.x.okr.assemble.common.date.WeekOfYear; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryEndDateEmpty; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryEndDateInvalid; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryStartDateEmpty; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryStartDateInvalid; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionQueryWithCondition; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionReportStatisitcWrapOut; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; -import com.x.okr.entity.OkrStatisticReportStatus; - -public class ActionStReportStatusListByFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStReportStatusListByFilter.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult result = new ActionResult<>(); - List wrapOutOkrReportSubmitStatusStatisticList = null; - List okrReportStatusStatisticList = null; - List unitNameLayer = null; - List headers = null; - List weeks = null; - List months = null; - Wi wrapIn = null; - WoOkrStatisticReportStatusTable wrapOutOkrReportSubmitStatusTable = new WoOkrStatisticReportStatusTable(); - Date startDate = null; - Date endDate = null; - String workTitle = null; - String startDateString = null; - String endDateString = null; - String workType = null; - String cycleType = "每周汇报"; - String centerId = null; - String workId = null; - String unitName = null; - String status = null; - - Boolean check = true; - - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - startDateString = wrapIn.getStartDate(); - if( startDateString != null ){ - try { - startDate = dateOperation.getDateFromString( startDateString ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryStartDateInvalid( e, startDateString ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionQueryStartDateEmpty(); - result.error( exception ); - } - endDateString = wrapIn.getEndDate(); - if( endDateString != null ){ - try { - endDate = dateOperation.getDateFromString( endDateString ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryEndDateInvalid( e, endDateString ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - }else{ - check = false; - Exception exception = new ExceptionQueryEndDateEmpty(); - result.error( exception ); - //logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - //查询过滤条件 - workTitle = wrapIn.getCenterTitle(); - workType = wrapIn.getWorkTypeName(); - cycleType = wrapIn.getCycleType(); - centerId = wrapIn.getCenterId(); - workId = wrapIn.getWorkId(); - unitName = wrapIn.getUnitName(); - status = wrapIn.getStatus(); - } - if( check ){ - try { - okrReportStatusStatisticList = okrReportStatusStatisticService.list( centerId, workTitle, workId, workType, unitName, cycleType, status ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionQueryWithCondition( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - if( check ){ - if( okrReportStatusStatisticList != null ){ - try { - wrapOutOkrReportSubmitStatusStatisticList = wrapout_copier.copy( okrReportStatusStatisticList ); - } catch (Exception e) { - check = false; - Exception exception = new ExceptionReportStatisitcWrapOut( e ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - } - } - if( "每月汇报".equals( cycleType ) ){ - months = dateOperation.getMonthsOfYear( startDate, endDate ); - headers = getHeaderForUnitMonthStatistic( months ); - unitNameLayer = getMonthFirstLayerArray( wrapOutOkrReportSubmitStatusStatisticList, months, startDate, endDate ); - }else{ - weeks = dateOperation.getWeeksOfYear( startDate, endDate ); - headers = getHeaderForUnitWeekStatistic( weeks ); - unitNameLayer = getWeekFirstLayerArray( wrapOutOkrReportSubmitStatusStatisticList, weeks, startDate, endDate ); - } - wrapOutOkrReportSubmitStatusTable.setHeader(headers); - wrapOutOkrReportSubmitStatusTable.setContent( unitNameLayer ); - result.setData( wrapOutOkrReportSubmitStatusTable ); - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportStatus{ - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStTreeByFilter.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStTreeByFilter.java deleted file mode 100644 index 68362d38b2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/ActionStTreeByFilter.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gson.JsonElement; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.statistic.exception.ExceptionWrapInConvert; - -public class ActionStTreeByFilter extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionStTreeByFilter.class); - - protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { - ActionResult> result = new ActionResult<>(); - Wi wrapIn = null; - Boolean check = true; - try { - wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); - } catch (Exception e ) { - check = false; - Exception exception = new ExceptionWrapInConvert( e, jsonElement ); - result.error( exception ); - logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try { - result = new ActionFilterList().execute( request, effectivePerson, wrapIn, true ); - } catch (Exception e) { - result = new ActionResult<>(); - result.error( e ); - logger.warn( "system excute ExcuteFilterList got an exception. " ); - logger.error( e ); - } - } - return result; - } - - public static class Wi extends WrapInFilterOkrStatisticReportContent { - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/BaseAction.java deleted file mode 100644 index db7d11e990..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/BaseAction.java +++ /dev/null @@ -1,888 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.common.date.MonthOfYear; -import com.x.okr.assemble.common.date.WeekOfYear; -import com.x.okr.assemble.control.schedule.entity.WorkBaseReportSubmitEntity; -import com.x.okr.assemble.control.schedule.entity.WorkReportProcessOpinionEntity; -import com.x.okr.assemble.control.service.OkrStatisticReportContentService; -import com.x.okr.assemble.control.service.OkrStatisticReportStatusService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; -import com.x.okr.assemble.control.service.OkrWorkDetailInfoService; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrWorkDetailInfo; - -public class BaseAction extends StandardJaxrsAction { - private static Logger logger = LoggerFactory.getLogger( BaseAction.class ); - protected WrapCopier wrapout_copier = WrapCopierFactory.wo( OkrStatisticReportStatus.class, WoOkrStatisticReportStatus.class, null, WoOkrStatisticReportStatus.Excludes); - - protected OkrStatisticReportStatusService okrReportStatusStatisticService = new OkrStatisticReportStatusService(); - protected OkrStatisticReportContentService okrCenterWorkReportStatisticService = new OkrStatisticReportContentService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoQueryService = new OkrWorkBaseInfoQueryService(); - protected OkrWorkDetailInfoService okrWorkDetailInfoService = new OkrWorkDetailInfoService(); - protected DateOperation dateOperation = new DateOperation(); - - protected List composeWorkInCenter( - List wraps_centers, String centerTitle, String workType, String statisticTimeFlag, String reportCycle, Integer year, Integer month, Integer week, String status ) { - List wrapout_centers = new ArrayList<>(); - List work_st_contents = null; - WoOkrStatisticReportContentCenter wrapout_center = null; - Integer workNumber = 0; - Integer workLevel = 1; - if( wraps_centers != null && !wraps_centers.isEmpty() ){ - for( WoOkrStatisticReportContentCenter center : wraps_centers ){ - workNumber = 0; - work_st_contents = center.getContents(); - - wrapout_center = new WoOkrStatisticReportContentCenter(); - wrapout_center.setCount( center.getCount() ); - wrapout_center.setId( center.getId() ); - wrapout_center.setTitle( center.getTitle() ); - wrapout_centers.add( wrapout_center ); - - if( work_st_contents != null && !work_st_contents.isEmpty() ){ - for( WoOkrStatisticReportContent work_st_content : work_st_contents ){ - workNumber++; - work_st_content.setSerialNumber( workNumber +"" ); - work_st_content.setLevel( workLevel ); - if( wrapout_center != null ){ - if( wrapout_center.getContents() == null ){ - wrapout_center.setContents( new ArrayList<>()); - } - wrapout_center.getContents().add( work_st_content ); - } - composeWorkStContent( wrapout_center, work_st_content, centerTitle, workType, workLevel, work_st_content.getSerialNumber(), statisticTimeFlag, reportCycle, year, month, week, status ); - } - } - } - } - return wrapout_centers; - } - - protected List composeWorkTreeInCenter( List wraps_centers, String centerTitle, String workType, String statisticTimeFlag, String reportCycle, Integer year, Integer month, Integer week, String status ) { - List work_st_contents = null; - Integer workNumber = 0; - Integer workLevel = 1; - if( wraps_centers != null && !wraps_centers.isEmpty() ){ - for( WoOkrStatisticReportContentCenter center : wraps_centers ){ - workNumber = 0; - work_st_contents = center.getContents(); - if( work_st_contents != null && !work_st_contents.isEmpty() ){ - for( WoOkrStatisticReportContent work_st_content : work_st_contents ){ - workNumber++; - work_st_content.setSerialNumber( workNumber +"" ); - work_st_content.setLevel( workLevel ); - composeWorkStContent( null, work_st_content, centerTitle, workType, workLevel, work_st_content.getSerialNumber(), statisticTimeFlag, reportCycle, year, month, week, status ); - } - } - } - } - return wraps_centers; - } - - protected void composeWorkStContent( - WoOkrStatisticReportContentCenter center, WoOkrStatisticReportContent work_st_content, String centerTitle, String workType, - Integer workLevel, String serialNumber, String statisticTimeFlag, String reportCycle, Integer year, Integer month, Integer week, String status ) { - List wrap_workContents = null; - List workContents = null; - List opinions = null; - List ids = null; - String opinionContent = null; - Integer cuurrent_workLevel = null; - Integer workNumber = 0; - Boolean hasSubWork = false; - OkrWorkDetailInfo okrWorkDetailInfo = null; - Gson gson = XGsonBuilder.instance(); - if( workLevel == null ){ - workLevel = 0; - } - if( work_st_content.getWorkId() != null &&!work_st_content.getWorkId().isEmpty() ){ - cuurrent_workLevel = workLevel.intValue() + 1; - try { - ids = okrCenterWorkReportStatisticService.list( null, centerTitle, work_st_content.getWorkId(), workType, statisticTimeFlag, reportCycle, year, month, week, status ); - if( ids != null && !ids.isEmpty() ){ - workContents = okrCenterWorkReportStatisticService.list( ids ); - if( workContents != null && !workContents.isEmpty() ){ - wrap_workContents = WoOkrStatisticReportContent.copier.copy( workContents ); - try { - SortTools.desc( wrap_workContents, "workTitle" ); - } catch (Exception e) { - logger.warn( "system sort wrap list got an exception." ); - logger.error(e); - } - for( WoOkrStatisticReportContent wrap : wrap_workContents ){ - try { - opinionContent = wrap.getOpinion(); - if( opinionContent != null && !"{}".equals( opinionContent )){ - opinions = gson.fromJson( opinionContent, new TypeToken>(){}.getType() ); - wrap.setOpinions( opinions ); - } - wrap.setId( null ); - wrap.setCenterId( null ); - wrap.setCenterTitle( null ); - wrap.setCreateTime( null ); - wrap.setUpdateTime( null ); - wrap.setSequence( null ); - wrap.setParentId( null ); - wrap.setWorkLevel( null ); - wrap.setStatisticTime( null ); - wrap.setStatisticYear( null ); - wrap.setStatisticMonth( null ); - wrap.setStatisticWeek( null ); - wrap.setStatus( null ); - wrap.setOpinion( null ); - wrap.setDistributeFactor( null ); - - okrWorkDetailInfo = okrWorkDetailInfoService.get( wrap.getWorkId() ); - if( okrWorkDetailInfo != null ){ - wrap.setLandmarkDescription( okrWorkDetailInfo.getLandmarkDescription() ); - wrap.setProgressAction( okrWorkDetailInfo.getProgressAction() ); - wrap.setWorkDetail( okrWorkDetailInfo.getWorkDetail() ); - } - //查询该工作下面是否还有下级工作 - hasSubWork = okrWorkBaseInfoQueryService.hasSubWork( wrap.getWorkId() ); - wrap.setHasSubWork(hasSubWork); - wrap.setLevel( cuurrent_workLevel ); - - workNumber ++; - wrap.setSerialNumber( work_st_content.getSerialNumber() + "." + workNumber ); - if( center != null ){ - if( center.getContents() == null ){ - center.setContents( new ArrayList<>()); - } - center.getContents().add( wrap ); - }else{ - work_st_content.addSubWork( wrap ); - } - composeWorkStContent( center, wrap, centerTitle, workType, cuurrent_workLevel, serialNumber, statisticTimeFlag, reportCycle, year, month, week, status); - } catch (Exception e) { - logger.warn( "system copy object to wrap got an exception." ); - logger.error(e); - } - } - } - } - } catch (Exception e) { - logger.warn( "system list work report statistic with condition got an exception." ); - logger.error(e); - } - } - } - - protected List getHeaderForUnitMonthStatistic( List months ) { - List headers = new ArrayList<>(); - WoOkrStatisticReportStatusHeader header = null; - //组织一个表格头 - if( months != null && !months.isEmpty() ){ - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( "组织名称" ); - headers.add( header ); - - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( "中心工作" ); - headers.add( header ); - - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( "工作内容" ); - headers.add( header ); - for( MonthOfYear month : months ){ - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( month.getYear() + "年第"+ month.getMonth() +"月" ); - header.setStartDate( month.getStartDateString() ); - header.setEndDate( month.getEndDateString() ); - headers.add( header ); - } - } - return headers; - } - - protected List getHeaderForUnitWeekStatistic(List weeks) { - List headers = new ArrayList<>(); - WoOkrStatisticReportStatusHeader header = null; - //组织一个表格头 - if( weeks != null && !weeks.isEmpty() ){ - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( "组织名称" ); - headers.add( header ); - - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( "中心工作" ); - headers.add( header ); - - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( "工作内容" ); - headers.add( header ); - for( WeekOfYear week : weeks ){ - header = new WoOkrStatisticReportStatusHeader(); - header.setTitle( week.getYear() + "年第"+ week.getWeekNo() +"周" ); - header.setStartDate( week.getStartDateString() ); - header.setEndDate( week.getEndDateString() ); - headers.add( header ); - } - } - return headers; - } - - protected List getMonthFirstLayerArray( List wrapOutOkrReportSubmitStatusStatisticList, List months, Date startDate, Date endDate) { - Date startDate_entity = null; - Date endDate_entity = null; - String statisticContent = null; - List unitNameLayer = new ArrayList<>(); - List centerLayer = null; - List workLayer = null; - WoOkrStatisticReportStatusEntity unitNameStatistic = null; - WoOkrStatisticReportStatusEntity centerWorkStatistic = null; - WoOkrStatisticReportStatusEntity workStatistic = null; - Gson gson = XGsonBuilder.instance(); - List list = null; - List wrapList = null; - WorkBaseReportSubmitEntity temp = null; - Boolean statisticExists = false; - Boolean check = true; - if( check ){ - //按组织排个序 - if( wrapOutOkrReportSubmitStatusStatisticList != null && !wrapOutOkrReportSubmitStatusStatisticList.isEmpty() ){ - for( WoOkrStatisticReportStatus statistic : wrapOutOkrReportSubmitStatusStatisticList ){ - unitNameStatistic = null; - centerLayer = null; - centerWorkStatistic = null; - workLayer = null; - workStatistic = null; - - //查找对应的组织的统计数据对象是否存在 - if( getFormUnitNameLayer( statistic.getResponsibilityUnitName(), unitNameLayer ) == null ){ - unitNameStatistic = new WoOkrStatisticReportStatusEntity(); - unitNameStatistic.setTitle( statistic.getResponsibilityUnitName() ); - unitNameStatistic.setId( statistic.getResponsibilityUnitName() ); - unitNameLayer.add( unitNameStatistic ); - }else{ - unitNameStatistic = getFormUnitNameLayer( statistic.getResponsibilityUnitName(), unitNameLayer ); - } - //获取组织统计对象里的中心工作列表 - if( unitNameStatistic.getArray() == null ){ - centerLayer = new ArrayList<>(); - unitNameStatistic.setArray( centerLayer ); - }else{ - centerLayer = unitNameStatistic.getArray(); - } - //在组织统计对象的中心工作列表里查找应用的中心工作是否存在 - if( getFormCenterLayer( statistic.getCenterId(), centerLayer ) == null ){ - centerWorkStatistic = new WoOkrStatisticReportStatusEntity(); - centerWorkStatistic.setId( statistic.getCenterId() ); - centerWorkStatistic.setTitle( statistic.getCenterTitle() ); - centerLayer.add( centerWorkStatistic ); - }else{ - centerWorkStatistic = getFormCenterLayer( statistic.getCenterId(), centerLayer ); - } - //获取组织统计对象里的工作列表 - if( centerWorkStatistic.getArray() == null ){ - workLayer = new ArrayList<>(); - centerWorkStatistic.setArray( workLayer ); - }else{ - workLayer = centerWorkStatistic.getArray(); - } - if( getFormWorkLayer( statistic.getWorkId(), workLayer ) == null ){ - workStatistic = new WoOkrStatisticReportStatusEntity(); - workStatistic.setId( statistic.getWorkId() ); - workStatistic.setTitle( statistic.getWorkTitle() ); - workStatistic.setDeployDate( statistic.getDeployDateStr() ); - workStatistic.setCompleteLimitDate( statistic.getCompleteDateLimitStr() ); - //过滤一下不需要的周期 - wrapList = new ArrayList<>(); - statisticContent = statistic.getReportStatistic(); - list = gson.fromJson( statisticContent, new TypeToken>(){}.getType() ); - if( list != null && !list.isEmpty() ){ - if( months != null && !months.isEmpty() ){ - for( MonthOfYear month : months ){ - statisticExists = false; - for( WorkBaseReportSubmitEntity entity : list ){ - if( month.getStartDateString().equals( entity.getStartDate() ) ){ - if( entity.getEndDate() != null ){ - try { - endDate_entity = dateOperation.getDateFromString( entity.getEndDate() ); - startDate_entity = dateOperation.getDateFromString( entity.getStartDate() ); - if( startDate.before( endDate_entity ) || endDate.after( startDate_entity )){ - statisticExists = true; - wrapList.add( entity ); - } - } catch (Exception e) { - logger.warn( "system format date got an exception." ); - logger.error(e); - } - } - } - } - //这里如果没有的要补齐 - if( !statisticExists ){ - temp = new WorkBaseReportSubmitEntity(); - temp.setCycleNumber( month.getMonth() ); - temp.setCycleType( "每月汇报" ); - temp.setDescription( "查询时间未在工作执行时间周期内" ); - temp.setEndDate( month.getEndDateString() ); - temp.setReportId( null ); - temp.setReportStatus( -1 ); - temp.setStartDate( month.getStartDateString() ); - temp.setSubmitTime(null); - wrapList.add( temp ); - } - } - } - } - workStatistic.setFields( wrapList ); - workLayer.add( workStatistic ); - unitNameStatistic.addRowCount( 1 ); - centerWorkStatistic.addRowCount( 1 ); - } - } - } - } - return unitNameLayer; - } - - protected List getWeekFirstLayerArray( List wrapOutOkrReportSubmitStatusStatisticList, List weeks, Date startDate, Date endDate ) { - Date startDate_entity = null; - Date endDate_entity = null; - String statisticContent = null; - List unitNameLayer = new ArrayList<>(); - List centerLayer = null; - List workLayer = null; - WoOkrStatisticReportStatusEntity unitNameStatistic = null; - WoOkrStatisticReportStatusEntity centerWorkStatistic = null; - WoOkrStatisticReportStatusEntity workStatistic = null; - Gson gson = XGsonBuilder.instance(); - List list = null; - List wrapList = null; - WorkBaseReportSubmitEntity temp = null; - Boolean statisticExists = false; - Boolean check = true; - if( check ){ - //按组织排个序 - if( wrapOutOkrReportSubmitStatusStatisticList != null && !wrapOutOkrReportSubmitStatusStatisticList.isEmpty() ){ - for( WoOkrStatisticReportStatus statistic : wrapOutOkrReportSubmitStatusStatisticList ){ - unitNameStatistic = null; - centerLayer = null; - centerWorkStatistic = null; - workLayer = null; - workStatistic = null; - - //查找对应的组织的统计数据对象是否存在 - if( getFormUnitNameLayer( statistic.getResponsibilityUnitName(), unitNameLayer ) == null ){ - unitNameStatistic = new WoOkrStatisticReportStatusEntity(); - unitNameStatistic.setTitle( statistic.getResponsibilityUnitName() ); - unitNameStatistic.setId( statistic.getResponsibilityUnitName() ); - unitNameLayer.add( unitNameStatistic ); - }else{ - unitNameStatistic = getFormUnitNameLayer( statistic.getResponsibilityUnitName(), unitNameLayer ); - } - //获取组织统计对象里的中心工作列表 - if( unitNameStatistic.getArray() == null ){ - centerLayer = new ArrayList<>(); - unitNameStatistic.setArray( centerLayer ); - }else{ - centerLayer = unitNameStatistic.getArray(); - } - //在组织统计对象的中心工作列表里查找应用的中心工作是否存在 - if( getFormCenterLayer( statistic.getCenterId(), centerLayer ) == null ){ - centerWorkStatistic = new WoOkrStatisticReportStatusEntity(); - centerWorkStatistic.setId( statistic.getCenterId() ); - centerWorkStatistic.setTitle( statistic.getCenterTitle() ); - centerLayer.add( centerWorkStatistic ); - }else{ - centerWorkStatistic = getFormCenterLayer( statistic.getCenterId(), centerLayer ); - } - //获取组织统计对象里的工作列表 - if( centerWorkStatistic.getArray() == null ){ - workLayer = new ArrayList<>(); - centerWorkStatistic.setArray( workLayer ); - }else{ - workLayer = centerWorkStatistic.getArray(); - } - if( getFormWorkLayer( statistic.getWorkId(), workLayer ) == null ){ - workStatistic = new WoOkrStatisticReportStatusEntity(); - workStatistic.setId( statistic.getWorkId() ); - workStatistic.setTitle( statistic.getWorkTitle() ); - workStatistic.setDeployDate( statistic.getDeployDateStr() ); - workStatistic.setCompleteLimitDate( statistic.getCompleteDateLimitStr() ); - //过滤一下不需要的周期 - wrapList = new ArrayList<>(); - statisticContent = statistic.getReportStatistic(); - if( statisticContent.indexOf("[") == 0 ) { - //证明是数组 - list = gson.fromJson( statisticContent, new TypeToken>(){}.getType() ); - if( list != null && !list.isEmpty() ){ - if( weeks != null && !weeks.isEmpty() ){ - for( WeekOfYear week : weeks ){ - statisticExists = false; - for( WorkBaseReportSubmitEntity entity : list ){ - if( week.getStartDateString().equals( entity.getStartDate() ) ){ - if( entity.getEndDate() != null ){ - try { - endDate_entity = dateOperation.getDateFromString( entity.getEndDate() ); - startDate_entity = dateOperation.getDateFromString( entity.getStartDate() ); - if( startDate.before( endDate_entity ) || endDate.after( startDate_entity )){ - statisticExists = true; - wrapList.add( entity ); - } - } catch (Exception e) { - logger.warn( "system format date got an exception." ); - logger.error(e ); - } - } - } - } - //这里如果没有的要补齐 - if( !statisticExists ){ - temp = new WorkBaseReportSubmitEntity(); - temp.setCycleNumber( week.getWeekNo() ); - temp.setCycleType( "每周汇报" ); - temp.setDescription( "查询时间未在工作执行时间周期内" ); - temp.setEndDate( week.getEndDateString() ); - temp.setReportId( null ); - temp.setReportStatus( -1 ); - temp.setStartDate( week.getStartDateString() ); - temp.setSubmitTime(null); - wrapList.add( temp ); - } - } - } - } - workStatistic.setFields( wrapList ); - workLayer.add( workStatistic ); - unitNameStatistic.addRowCount( 1 ); - centerWorkStatistic.addRowCount( 1 ); - } - } - } - } - } - return unitNameLayer; - } - - protected WoOkrStatisticReportStatusEntity getFormWorkLayer(String workId, List workLayer) { - if( workId == null || workId.isEmpty() ){ - return null; - } - if( workLayer == null || workLayer.isEmpty() ){ - return null; - } - for( WoOkrStatisticReportStatusEntity entity : workLayer ){ - if( workId.equals( entity.getId() ) ){ - return entity; - } - } - return null; - } - - protected WoOkrStatisticReportStatusEntity getFormCenterLayer(String centerId, List centerLayer) { - if( centerId == null || centerId.isEmpty() ){ - return null; - } - if( centerLayer == null || centerLayer.isEmpty() ){ - return null; - } - for( WoOkrStatisticReportStatusEntity entity : centerLayer ){ - if( centerId.equals( entity.getId() ) ){ - return entity; - } - } - return null; - } - - - protected WoOkrStatisticReportStatusEntity getFormUnitNameLayer( String responsibilityUnitName, List unitNameLayer) { - if( responsibilityUnitName == null || responsibilityUnitName.isEmpty() ){ - return null; - } - if( unitNameLayer == null || unitNameLayer.isEmpty() ){ - return null; - } - for( WoOkrStatisticReportStatusEntity entity : unitNameLayer ){ - if( responsibilityUnitName.equals( entity.getTitle() ) ){ - return entity; - } - } - return null; - } - - protected WoOkrStatisticReportContentCenter getContentFormCenterList( String centerId, List wraps_centers) { - if( wraps_centers == null ){ - wraps_centers = new ArrayList<>(); - } - for( WoOkrStatisticReportContentCenter center : wraps_centers){ - if( center.getId().equals( centerId )){ - if( center.getContents() == null ){ - center.setContents( new ArrayList<>()); - } - return center; - } - } - return null; - } - - public static class WoOkrStatisticReportContentCenter{ - - private String id = null; - - private String title = null; - - private Integer count = 0; - - private List contents = null; - - public String getTitle() { - return title; - } - - public Integer getCount() { - return count; - } - - public void setTitle(String title) { - this.title = title; - } - - public void setCount(Integer count) { - this.count = count; - } - - public List getContents() { - return contents; - } - - public void setContents(List contents) { - this.contents = contents; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer countAdd( Integer number ){ - this.count = this.count + number; - return this.count; - } - } - - public static class WoOkrStatisticReportContent extends OkrStatisticReportContent{ - - private static final long serialVersionUID = -5076990764713538973L; - - - public static WrapCopier copier = WrapCopierFactory.wo( OkrStatisticReportContent.class, WoOkrStatisticReportContent.class, null, JpaObject.FieldsInvisible); - - private String serialNumber = "1"; - - private Integer level = 1; - - private String workDetail = null; - - private String progressAction = null; - - private String landmarkDescription = null; - - private Boolean hasSubWork = false; - - private List opinions = null; - - private List subWork = null; - - public List getOpinions() { - return opinions; - } - - public void setOpinions(List opinions) { - this.opinions = opinions; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public Boolean getHasSubWork() { - return hasSubWork; - } - - public void setHasSubWork( Boolean hasSubWork) { - this.hasSubWork = hasSubWork; - } - - public String getSerialNumber() { - return serialNumber; - } - - public void setSerialNumber(String serialNumber) { - this.serialNumber = serialNumber; - } - - public Integer getLevel() { - return level; - } - - public void setLevel(Integer level) { - this.level = level; - } - - public List getSubWork() { - return subWork; - } - - public void setSubWork(List subWork) { - this.subWork = subWork; - } - - public void addSubWork( WoOkrStatisticReportContent work ){ - if( this.subWork == null ){ - this.subWork = new ArrayList<>(); - } - this.subWork.add( work ); - } - } - - public static class WoOkrReportSubmitStatusDate{ - - private String datetime = null; - - private String reportCycle = null; - - public WoOkrReportSubmitStatusDate( String datetime, String reportCycle ){ - this.datetime = datetime; - this.reportCycle = reportCycle; - } - - public String getDatetime() { - return datetime; - } - - public String getReportCycle() { - return reportCycle; - } - - public void setDatetime(String datetime) { - this.datetime = datetime; - } - - public void setReportCycle(String reportCycle) { - this.reportCycle = reportCycle; - } - } - - public static class WoOkrStatisticReportStatusTable{ - - private List header = null; - - private List content = null; - - public List getHeader() { - return header; - } - - public void setHeader(List header) { - this.header = header; - } - - public List getContent() { - return content; - } - - public void setContent(List content) { - this.content = content; - } - } - - public static class WoOkrStatisticReportStatusHeader{ - - private String title = null; - - private String startDate = null; - - private String endDate = null; - - private String description = null; - - private Integer width = null; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getWidth() { - return width; - } - - public void setWidth(Integer width) { - this.width = width; - } - - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } - } - - public class WoOkrStatisticReportStatusEntity{ - - private String id = null; - - private String title = null; - - private String deployDate = null; - - private String completeLimitDate = null; - - private List fields = null; - - private List array = null; - - private Integer rowCount = 0; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public List getArray() { - return array; - } - - public void setArray(List array) { - this.array = array; - } - - public Integer getRowCount() { - return rowCount; - } - - public void setRowCount(Integer rowCount) { - this.rowCount = rowCount; - } - - public void addRowCount( Integer number ){ - this.rowCount = this.rowCount + number; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeployDate() { - return deployDate; - } - - public void setDeployDate(String deployDate) { - this.deployDate = deployDate; - } - - public String getCompleteLimitDate() { - return completeLimitDate; - } - - public void setCompleteLimitDate(String completeLimitDate) { - this.completeLimitDate = completeLimitDate; - } - - public List getFields() { - return fields; - } - - public void setFields(List fields) { - this.fields = fields; - } - } - - public static class WoOkrStatisticReportStatus extends OkrStatisticReportStatus{ - - private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - private List statistic = null; - - private Long rank = 0L; - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public List getStatistic() { - return statistic; - } - - public void setStatistic(List statistic) { - this.statistic = statistic; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportContentAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportContentAction.java deleted file mode 100644 index 23c7266852..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportContentAction.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.okrworkreportprocesslog.ActionSave; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrReportSubmitStatusDate; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportContentCenter; - -@Path("streportcontent") -@JaxrsDescribe("工作汇报内容统计信息管理服务") -public class OkrStatisticReportContentAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrStatisticReportContentAction.class); - - @JaxrsMethodDescribe(value = "测试定时代理，对工作的汇报情况进行统计分析", action = ActionSave.class) - @GET - @Path("excute") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void excute(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportContentCaculate().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "测试定时代理，对工作的汇报提交情况进行统计分析.", action = ActionStReportContentCaculateAll.class) - @GET - @Path("excute/all") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void excuteAll(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportContentCaculateAll().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @Path("filter/list") - @JaxrsMethodDescribe(value = "根据条件获取OkrStatisticReportContent部分信息对象.", action = ActionStReportContentListByFilter.class) - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listByCondition(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionStReportContentListByFilter().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @Path("filter/tree") - @JaxrsMethodDescribe(value = "根据条件获取OkrStatisticReportContent部分信息对象.", action = ActionStTreeByFilter.class) - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void treeByCondition(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionStTreeByFilter().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @Path("filter/sub/{parentId}") - @JaxrsMethodDescribe(value = "根据条件获取OkrStatisticReportContent部分信息对象.", action = ActionStReportContentListSubByFilter.class) - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listReportContentByCondition(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, - @JaxrsParameterDescribe("上级工作信息ID") @PathParam("parentId") String parentId, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionStReportContentListSubByFilter().execute(request, effectivePerson, parentId, - jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @Path("date/list") - @JaxrsMethodDescribe(value = "根据条件获取统计的日期列表.", action = ActionStReportContentListDateByFilter.class) - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listDateByCondition(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult> result = new ActionResult<>(); - try { - result = new ActionStReportContentListDateByFilter().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @Path("export") - @JaxrsMethodDescribe(value = "根据条件获取OkrStatisticReportContent部分信息对象.", action = ActionStReportContentExport.class) - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void export(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @Context HttpServletResponse response, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportContentExport().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportStatusAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportStatusAction.java deleted file mode 100644 index cb5d644159..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/OkrStatisticReportStatusAction.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapOutString; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.jaxrs.statistic.BaseAction.WoOkrStatisticReportStatusTable; - -@Path("streportstatus") -@JaxrsDescribe("工作汇报状态统计信息管理服务") -public class OkrStatisticReportStatusAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrStatisticReportStatusAction.class); - - @JaxrsMethodDescribe(value = "测试定时代理，对工作的汇报提交情况进行统计分析", action = ActionStReportStatusCaculate.class) - @GET - @Path("excute") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void excute(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportStatusCaculate().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteStReportStatusCaculate got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "测试定时代理，对工作的汇报提交情况进行统计分析", action = ActionStReportStatusCaculateAll.class) - @GET - @Path("excute/all") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void excuteAll(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportStatusCaculateAll().execute(request, effectivePerson); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteStReportStatusCaculateAll got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "导出工作的汇报状态统计信息", action = ActionStReportStatusExport.class) - @Path("export") - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void export(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportStatusExport().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.warn("system excute ExcuteStReportStatusCaculateAll got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - @JaxrsMethodDescribe(value = "根据条件查询工作的汇报状态统计信息", action = ActionStReportStatusListByFilter.class) - @Path("filter/list") - @PUT - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listReportStatusByCondition(@Suspended final AsyncResponse asyncResponse, - @Context HttpServletRequest request, JsonElement jsonElement) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionStReportStatusListByFilter().execute(request, effectivePerson, jsonElement); - } catch (Exception e) { - result = new ActionResult<>(); - result.error(e); - logger.error(e, effectivePerson, request, null); - logger.warn("system excute ExcuteStReportStatusCaculateAll got an exception. "); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportContent.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportContent.java deleted file mode 100644 index a8d2943579..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportContent.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import com.x.base.core.project.annotation.FieldDescribe; - -public class WrapInFilterOkrStatisticReportContent { - @FieldDescribe("工作汇报周期：每周汇报|每月汇报") - private String reportCycle = null; - - @FieldDescribe("中心工作ID") - private String centerId = null; - - @FieldDescribe("中心工作标题") - private String centerTitle = null; - - @FieldDescribe("工作类型名称") - private String workTypeName = null; - - @FieldDescribe("上级工作ID") - private String parentWorkId = null; - - @FieldDescribe("工作级别") - private String workLevel = null; - - @FieldDescribe("统计时间标识") - private String statisticTimeFlag = null; - - @FieldDescribe("开始日期") - private String startDate = null; - - @FieldDescribe("结束日期") - private String endDate = null; - - @FieldDescribe("统计年份") - private Integer year = 0; - - @FieldDescribe("统计月份") - private Integer month = 0; - - @FieldDescribe("统计周数") - private Integer week = 0; - - @FieldDescribe("工作状态：正常|已归档") - private String status = "正常"; - - @FieldDescribe("排序类型") - private String order = "DESC"; - - private Boolean stream = true; - - public String getStatus() { - return status; - } - public void setStatus(String status) { - this.status = status; - } - public String getReportCycle() { - return reportCycle; - } - public void setReportCycle(String reportCycle) { - this.reportCycle = reportCycle; - } - public String getCenterId() { - return centerId; - } - public void setCenterId(String centerId) { - this.centerId = centerId; - } - public String getWorkTypeName() { - return workTypeName; - } - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - public String getParentWorkId() { - return parentWorkId; - } - public void setParentWorkId(String parentWorkId) { - this.parentWorkId = parentWorkId; - } - public String getWorkLevel() { - return workLevel; - } - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - public Integer getYear() { - return year; - } - public void setYear(Integer year) { - this.year = year; - } - public Integer getMonth() { - return month; - } - public void setMonth(Integer month) { - this.month = month; - } - public Integer getWeek() { - return week; - } - public void setWeek(Integer week) { - this.week = week; - } - - public String getStatisticTimeFlag() { - return statisticTimeFlag; - } - public void setStatisticTimeFlag(String statisticTimeFlag) { - this.statisticTimeFlag = statisticTimeFlag; - } - public String getStartDate() { - return startDate; - } - public String getEndDate() { - return endDate; - } - public void setStartDate(String startDate) { - this.startDate = startDate; - } - public void setEndDate(String endDate) { - this.endDate = endDate; - } - public String getOrder() { - return order; - } - public void setOrder(String order) { - this.order = order; - } - public Boolean getStream() { - return stream; - } - public void setStream(Boolean stream) { - this.stream = stream; - } - public String getCenterTitle() { - return centerTitle; - } - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportStatus.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportStatus.java deleted file mode 100644 index 29dc49157e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/WrapInFilterOkrStatisticReportStatus.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic; - -import com.x.base.core.project.annotation.FieldDescribe; - -public class WrapInFilterOkrStatisticReportStatus { - @FieldDescribe("查询开始日期") - private String startDate = null; - - @FieldDescribe("中心工作标题") - private String centerTitle = null; - - @FieldDescribe("查询结束日期") - private String endDate = null; - - @FieldDescribe("具体工作ID") - private String workId = null; - - @FieldDescribe("工作类型") - private String workTypeName = null; - - @FieldDescribe("工作责任部门") - private String unitName = null; - - @FieldDescribe("中心工作ID") - private String centerId = ""; - - @FieldDescribe("工作汇报周期：每周汇报|每月汇报") - private String cycleType = "每周汇报"; - - @FieldDescribe("工作状态：正常|已归档") - private String status = "正常"; - - public String getStatus() { - return status; - } - public void setStatus(String status) { - this.status = status; - } - public String getStartDate() { - return startDate; - } - public void setStartDate(String startDate) { - this.startDate = startDate; - } - public String getEndDate() { - return endDate; - } - public void setEndDate(String endDate) { - this.endDate = endDate; - } - public String getWorkId() { - return workId; - } - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getWorkTypeName() { - return workTypeName; - } - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - public String getUnitName() { - return unitName; - } - public void setUnitName(String unitName) { - this.unitName = unitName; - } - public String getCenterId() { - return centerId; - } - public void setCenterId(String centerId) { - this.centerId = centerId; - } - public String getCycleType() { - return cycleType; - } - public void setCycleType(String cycleType) { - this.cycleType = cycleType; - } - public String getCenterTitle() { - return centerTitle; - } - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateEmpty.java deleted file mode 100644 index 5afb2f8cc8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionQueryEndDateEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionQueryEndDateEmpty() { - super("查询条件结束日期为空。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateInvalid.java deleted file mode 100644 index d72190e290..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryEndDateInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionQueryEndDateInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionQueryEndDateInvalid( Throwable e, String date ) { - super("查询条件中结束日期不合法。Date：" + date, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryParentIdEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryParentIdEmpty.java deleted file mode 100644 index da78f5ae40..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryParentIdEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionQueryParentIdEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionQueryParentIdEmpty() { - super("查询条件上级工作ID为空。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateEmpty.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateEmpty.java deleted file mode 100644 index 545b86beca..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionQueryStartDateEmpty extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionQueryStartDateEmpty() { - super("查询条件开始日期为空。"); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateInvalid.java deleted file mode 100644 index 530ba189ae..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryStartDateInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionQueryStartDateInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionQueryStartDateInvalid( Throwable e, String date ) { - super("查询条件中开始日期不合法。Dates：" + date, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryWithCondition.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryWithCondition.java deleted file mode 100644 index d1f62a45f7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionQueryWithCondition.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionQueryWithCondition extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionQueryWithCondition( Throwable e ) { - super("根据条件查询统计数据时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcList.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcList.java deleted file mode 100644 index fbaf1e133a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcList.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportStatisitcList extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportStatisitcList( Throwable e ) { - super("根据条件查询汇报情况统计数据时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcListWithIds.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcListWithIds.java deleted file mode 100644 index 0d4caef4f2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcListWithIds.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportStatisitcListWithIds extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportStatisitcListWithIds( Throwable e ) { - super("根据ID列表查询汇报情况统计数据时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcWrapOut.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcWrapOut.java deleted file mode 100644 index cd04989a10..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionReportStatisitcWrapOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionReportStatisitcWrapOut extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionReportStatisitcWrapOut( Throwable e ) { - super("将查询结果转换为可以输出的数据信息时发生异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionStatisticTimeInvalid.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionStatisticTimeInvalid.java deleted file mode 100644 index e452f35801..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionStatisticTimeInvalid.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionStatisticTimeInvalid extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionStatisticTimeInvalid( Throwable e, String date ) { - super("统计日期不合法。Date：" + date, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionWrapInConvert.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionWrapInConvert.java deleted file mode 100644 index e977391ea3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/statistic/exception/ExceptionWrapInConvert.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.statistic.exception; - -import com.google.gson.JsonElement; -import com.x.base.core.project.exception.PromptException; - -public class ExceptionWrapInConvert extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExceptionWrapInConvert( Throwable e, JsonElement jsonElement) { - super( "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString(), e); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/uuid/UUIDAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/uuid/UUIDAction.java deleted file mode 100644 index a84b3b2bc4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/uuid/UUIDAction.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.uuid; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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 javax.ws.rs.core.Response; - -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.service.OkrUserInfoService; - -/** - * 该类旨在提供一个服务创建唯一的UNID - */ -@Path("uuid") -public class UUIDAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(UUIDAction.class); - private OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - - // @JaxrsMethodDescribe(value = "根据随机ID的.", response = JsonElement.class) - @GET - @Path("random") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void getUUID(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) { - ActionResult> result = new ActionResult<>(); - List data = new ArrayList(); - String uuid = null; - EffectivePerson currentPerson = this.effectivePerson(request); - String proxyIndentity = null; - try { - proxyIndentity = okrUserInfoService.getLoginIdentity(currentPerson.getDistinguishedName()); - } catch (Exception e1) { - logger.warn("system get login indentity with person name got an exception", e1); - } - try { - uuid = UUID.randomUUID().toString(); - logger.info("user[" + currentPerson.getDistinguishedName() + "][proxy:'" + proxyIndentity - + "'] get a new UUID：" + uuid); - data.add(uuid); - result.setData(data); - } catch (Exception e) { - logger.warn("user[" + currentPerson.getDistinguishedName() + "][proxy:'" + proxyIndentity - + "'] get a new UUID error！", e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/ActionWorkImport.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/ActionWorkImport.java deleted file mode 100644 index 1e328aa167..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/ActionWorkImport.java +++ /dev/null @@ -1,786 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.glassfish.jersey.media.multipart.FormDataContentDisposition; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.DefaultCharset; -import com.x.okr.assemble.common.excel.reader.ExcelReaderUtil; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.ExceptionEmptyExtension; -import com.x.okr.assemble.control.jaxrs.okrattachmentfileinfo.exception.URLParameterGetException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.CenterWorkNotExistsException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.CenterWorkQueryByIdException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.ExcelReadException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.GetOkrUserCacheException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.NoDataException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.ReportCycleInvalidException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.ReportDayInCycleEmptyException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.ReportDayInCycleInvalidException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.UserNoLoginException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.UserUnitQueryException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkCompleteDateLimitEmptyException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkCompleteDateLimitFormatException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkCooperateInvalidException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkImportDataCheckException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkImportDataException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkNotExistsException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkReadLeaderInvalidException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkResponsibilityEmptyException; -import com.x.okr.assemble.control.jaxrs.workimport.exception.WorkResponsibilityInvalidException; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class ActionWorkImport extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionWorkImport.class); - - protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, - String centerId, String site, byte[] bytes, FormDataContentDisposition disposition) { - ActionResult result = new ActionResult<>(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrUserCache okrUserCache = null; - String fileName = null; - Boolean check = true; - - if( check ){ - if( StringUtils.isEmpty(centerId) ){ - check = false; - Exception exception = new URLParameterGetException( new Exception("未获取到中心工作ID") ); - result.error( exception ); - } - } - - if (check) { - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new GetOkrUserCacheException(e, effectivePerson.getDistinguishedName()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new UserNoLoginException(effectivePerson.getDistinguishedName()); - result.error(exception); - } - - if (check) { - if (okrUserCache.getLoginUserName() == null) { - check = false; - Exception exception = new UserNoLoginException(effectivePerson.getDistinguishedName()); - result.error(exception); - } - } - - // 判断中心工作信息是否存在 - if (check) { - try { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkInfo = emc.find(centerId, OkrCenterWorkInfo.class); - if (null == okrCenterWorkInfo) {// 中心工作不存在 - check = false; - Exception exception = new CenterWorkNotExistsException(centerId); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - } - } catch (Exception e) {// 获取中心工作发生异常 - check = false; - Exception exception = new CenterWorkQueryByIdException(e, centerId); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - if( check ){ - try { - fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name)); - /** 禁止不带扩展名的文件上传 */ - if (StringUtils.isEmpty(fileName)) { - check = false; - Exception exception = new ExceptionEmptyExtension( fileName ); - result.error( exception ); - } - } catch (Exception e) { - check = false; - result.error( e ); - } - } - - if( check ){ - // 读取EXCEL文件中的所有数据 - ThisApplication.getImportFileStatusMap().remove(effectivePerson.getDistinguishedName()); - InputStream input = new ByteArrayInputStream(bytes); - try { - ExcelReaderUtil.readExcel( new WorkImportExcelReader(), fileName, input, effectivePerson.getDistinguishedName(), 1); - } catch (Exception e) { - check = false; - Exception exception = new ExcelReadException(e); - result.error(exception); - } - } - - if (check) { - List importRowList = null; - // 对从EXCEL文件里获取的所有信息逐一进行数据校验以及保存操作 - CacheImportFileStatus cacheImportFileStatus = null; - cacheImportFileStatus = ThisApplication.getCacheImportFileStatusElementByKey(effectivePerson.getDistinguishedName()); - if (cacheImportFileStatus != null) { - importRowList = cacheImportFileStatus.getDetailList(); - if (importRowList != null) { - result = saveAllImportRow(request, centerId, importRowList, effectivePerson); - } - } - } - ThisApplication.getImportFileStatusMap().remove(effectivePerson.getDistinguishedName()); - return result; - } - - /** - * 检验所有需要保存的工作信息数据、补全数据，并且保存信息 - * - * @param importRowList - * @return - */ - private ActionResult saveAllImportRow(HttpServletRequest request, String centerId, - List importRowList, EffectivePerson effectivePerson) { - ActionResult result = new ActionResult(); - if (importRowList == null || importRowList.isEmpty()) { - Exception exception = new NoDataException(); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - return result; - } - List wrapInList = new ArrayList(); - List errorWrapInList = new ArrayList(); - Wi wrapInOkrWorkBaseInfo = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - // 这里需要去配置表里查询配置的汇报发起具体的时间点，如：10:00:00 - String reportStartTime = "10:00:00"; - String[] identityNames = null; - String userName = null, unitName = null, topUnitName = null, identity = null; - String currentUserIdentityName = null; - String currentUserUnitName = null; - String currentUserTopUnitName = null; - String yearString = dateOperation.getYear(new Date()), monthString = dateOperation.getMonth(new Date()), nowDateString = dateOperation.getNowDateTime(); - Boolean check = true; - OkrUserCache okrUserCache = null; - try { - okrUserCache = okrUserInfoService.getOkrUserCacheWithPersonName(effectivePerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new GetOkrUserCacheException(e, effectivePerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - - if( check ){ - try{ - reportStartTime = okrConfigSystemService.getValueWithConfigCode( "REPORT_CREATETIME" ); - if( reportStartTime == null || reportStartTime.isEmpty() ){ - reportStartTime = "10:00:00"; - } - }catch(Exception e){ - reportStartTime = "10:00:00"; - } - } - - if (check && (okrUserCache == null || okrUserCache.getLoginIdentityName() == null)) { - check = false; - Exception exception = new UserNoLoginException(effectivePerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - - if (check) { - // 补充中心工作标题 - if (centerId != null && !centerId.isEmpty()) { - // 根据ID查询中心工作信息 - try { - okrCenterWorkInfo = okrCenterWorkInfoService.get(centerId); - } catch (Exception e) { - check = false; - Exception exception = new CenterWorkQueryByIdException(e, centerId); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - } - - if (check) { - if (okrCenterWorkInfo == null) { - check = false; - Exception exception = new CenterWorkNotExistsException(centerId); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - } - - if (check) { - try { - currentUserIdentityName = okrUserManagerService.getIdentityWithPerson(effectivePerson.getDistinguishedName()); - } catch (Exception e) { - check = false; - Exception exception = new UserUnitQueryException(e, effectivePerson.getDistinguishedName()); - result.error(exception); - } - } - if (check) { - try { - currentUserUnitName = okrUserManagerService.getUnitNameByIdentity(currentUserIdentityName); - } catch (Exception e) { - check = false; - Exception exception = new UserUnitQueryException(e, currentUserIdentityName); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - if (check) { - try { - currentUserTopUnitName = okrUserManagerService.getTopUnitNameByIdentity(currentUserIdentityName); - } catch (Exception e) { - check = false; - Exception exception = new UserUnitQueryException(e, currentUserIdentityName); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - - List identities = null; - for (CacheImportRowDetail cacheImportRowDetail : importRowList) { - wrapInOkrWorkBaseInfo = new Wi(); - - wrapInOkrWorkBaseInfo.setCompleteDateLimit(cacheImportRowDetail.getCompleteDateLimit()); - wrapInOkrWorkBaseInfo.setCompleteDateLimitStr(cacheImportRowDetail.getCompleteDateLimitStr()); - - identities = new ArrayList<>(); - if(StringUtils.isNotEmpty( cacheImportRowDetail.getCooperateIdentity() )) { - String[] arr = cacheImportRowDetail.getCooperateIdentity().split( "," ); - for( String _identity : arr ) { - identities.add( _identity ); - } - } - wrapInOkrWorkBaseInfo.setCooperateIdentityList(identities); - - wrapInOkrWorkBaseInfo.setCreatorIdentity(currentUserIdentityName); - wrapInOkrWorkBaseInfo.setDeployerIdentity(okrUserCache.getLoginIdentityName()); - - wrapInOkrWorkBaseInfo.setDutyDescription(cacheImportRowDetail.getDutyDescription()); - wrapInOkrWorkBaseInfo.setMajorIssuesDescription(cacheImportRowDetail.getMajorIssuesDescription()); - wrapInOkrWorkBaseInfo.setLandmarkDescription(cacheImportRowDetail.getLandmarkDescription()); - wrapInOkrWorkBaseInfo.setParentWorkId(cacheImportRowDetail.getParentWorkId()); - wrapInOkrWorkBaseInfo.setProgressAction(cacheImportRowDetail.getProgressAction()); - wrapInOkrWorkBaseInfo.setProgressPlan(cacheImportRowDetail.getProgressPlan()); - - identities = new ArrayList<>(); - if(StringUtils.isNotEmpty( cacheImportRowDetail.getReadLeaderIdentity() )) { - String[] arr = cacheImportRowDetail.getReadLeaderIdentity().split( "," ); - for( String _identity : arr ) { - identities.add( _identity ); - } - } - wrapInOkrWorkBaseInfo.setReadLeaderIdentityList(identities); - - wrapInOkrWorkBaseInfo.setResultDescription(cacheImportRowDetail.getResultDescription()); - wrapInOkrWorkBaseInfo.setTitle(cacheImportRowDetail.getTitle()); - wrapInOkrWorkBaseInfo.setWorkDateTimeType(cacheImportRowDetail.getWorkDateTimeType()); - wrapInOkrWorkBaseInfo.setWorkDetail(cacheImportRowDetail.getWorkDetail()); - wrapInOkrWorkBaseInfo.setWorkLevel(cacheImportRowDetail.getWorkLevel()); - wrapInOkrWorkBaseInfo.setWorkType(okrCenterWorkInfo.getDefaultWorkType()); - wrapInOkrWorkBaseInfo.setReportCycle(cacheImportRowDetail.getReportCycle()); - wrapInOkrWorkBaseInfo.setReportDayInCycle(cacheImportRowDetail.getReportDayInCycle()); - wrapInOkrWorkBaseInfo.setCheckSuccess(cacheImportRowDetail.getCheckStatus()); - wrapInOkrWorkBaseInfo.setDescription(cacheImportRowDetail.getDescription()); - - if ("success".equals(wrapInOkrWorkBaseInfo.getCheckSuccess())) { - try { - wrapInOkrWorkBaseInfo.setWorkProcessStatus("草稿"); - - // 对wrapIn里的信息进行校验 - if (check && okrUserCache.getLoginIdentityName() == null) { - check = false; - Exception exception = new UserNoLoginException(effectivePerson.getDistinguishedName()); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - } - - if (check) { - wrapInOkrWorkBaseInfo.setCenterId(centerId); - wrapInOkrWorkBaseInfo.setCenterTitle(okrCenterWorkInfo.getTitle()); - } - - if (check) { - // 创建人和部署人信息直接取当前操作人和登录人身份 - wrapInOkrWorkBaseInfo.setCreatorName(effectivePerson.getDistinguishedName()); - if (effectivePerson.getDistinguishedName().equals(okrUserCache.getLoginUserName())) { - // 如果登录人和代理的身份的姓名是一致的，说明本来就是操作本人身份 - wrapInOkrWorkBaseInfo.setCreatorUnitName(okrUserCache.getLoginUserUnitName()); - wrapInOkrWorkBaseInfo.setCreatorTopUnitName(okrUserCache.getLoginUserTopUnitName()); - wrapInOkrWorkBaseInfo.setCreatorIdentity(okrUserCache.getLoginIdentityName()); - } else { - // 如果不是操作本人身份，则需要查询创建者的相关身份 - wrapInOkrWorkBaseInfo.setCreatorIdentity(currentUserIdentityName); - wrapInOkrWorkBaseInfo.setCreatorUnitName(currentUserUnitName); - wrapInOkrWorkBaseInfo.setCreatorTopUnitName(currentUserTopUnitName); - } - } - - if (check) { - wrapInOkrWorkBaseInfo.setDeployerName(okrUserCache.getLoginUserName()); - if (effectivePerson.getDistinguishedName().equals(okrUserCache.getLoginUserName())) { - wrapInOkrWorkBaseInfo.setDeployerUnitName(okrUserCache.getLoginUserUnitName()); - wrapInOkrWorkBaseInfo.setDeployerTopUnitName(okrUserCache.getLoginUserTopUnitName()); - wrapInOkrWorkBaseInfo.setDeployerIdentity(okrUserCache.getLoginIdentityName()); - } - } - - // 补充部署工作的年份和月份 - if (check) { - wrapInOkrWorkBaseInfo.setDeployYear(yearString); - wrapInOkrWorkBaseInfo.setDeployMonth(monthString); - wrapInOkrWorkBaseInfo.setDeployDateStr(nowDateString); - } - - if (check) { - // cacheImportRowDetail.getParentWorkId()); - // 检验上级工作信息 - if (cacheImportRowDetail.getParentWorkId() != null - && !cacheImportRowDetail.getParentWorkId().isEmpty()) { - // 根据ID查询中心工作信息 - okrWorkBaseInfo = okrWorkBaseInfoQueryService.get(cacheImportRowDetail.getParentWorkId()); - if (okrWorkBaseInfo != null) { - wrapInOkrWorkBaseInfo.setParentWorkId(okrWorkBaseInfo.getId()); - wrapInOkrWorkBaseInfo.setParentWorkTitle(okrWorkBaseInfo.getTitle()); - } else { - check = false; - Exception exception = new WorkNotExistsException( - cacheImportRowDetail.getParentWorkId()); - result.error(exception); - // logger.error( e, effectivePerson, request, - // null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription( - "上级工作不存在, id:'" + cacheImportRowDetail.getParentWorkId() + "'，无法继续保存工作信息!"); - } - } - } - - // 校验工作完成时限数据，补充日期型完成时限数据 - if (check) { - if (cacheImportRowDetail.getCompleteDateLimitStr() != null - && !cacheImportRowDetail.getCompleteDateLimitStr().isEmpty()) { - try { - wrapInOkrWorkBaseInfo.setCompleteDateLimit(dateOperation - .getDateFromString(cacheImportRowDetail.getCompleteDateLimitStr())); - } catch (Exception e) { - check = false; - Exception exception = new WorkCompleteDateLimitFormatException(e, cacheImportRowDetail.getCompleteDateLimitStr()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("工作完成时限格式不正确：" + cacheImportRowDetail.getCompleteDateLimitStr() + "，无法继续保存工作信息!"); - } - } else { - check = false; - Exception exception = new WorkCompleteDateLimitEmptyException(); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("工作完成时限信息为空，无法继续保存工作信息!"); - } - } - - // 校验责任者数据， 判断责任者组织信息是否存在，如果不存在，则需要补充组织者组织信息 - if (check) { - if (cacheImportRowDetail.getResponsibilityIdentity() != null - && !cacheImportRowDetail.getResponsibilityIdentity().isEmpty()) { - userName = ""; - identity = ""; - unitName = ""; - topUnitName = ""; - identityNames = cacheImportRowDetail.getResponsibilityIdentity().split(","); - try { - for (String _identity : identityNames) { - if (okrUserManagerService.getPersonNameByIdentity(_identity) == null) { - throw new Exception("person not exsits, identity:" + _identity); - } - if (identity == null || identity.isEmpty()) { - identity += _identity; - } else { - identity += "," + _identity; - } - if (userName == null || userName.isEmpty()) { - userName = okrUserManagerService.getPersonNameByIdentity(_identity); - } else { - userName += "," + okrUserManagerService.getPersonNameByIdentity(_identity); - } - if (unitName == null || unitName.isEmpty()) { - unitName = okrUserManagerService.getUnitNameByIdentity(_identity); - } else { - unitName += "," + okrUserManagerService.getUnitNameByIdentity(_identity); - } - if (topUnitName == null || topUnitName.isEmpty()) { - topUnitName = okrUserManagerService.getTopUnitNameByIdentity(_identity); - } else { - topUnitName += "," + okrUserManagerService.getTopUnitNameByIdentity(_identity); - } - } - wrapInOkrWorkBaseInfo.setResponsibilityEmployeeName(userName); - wrapInOkrWorkBaseInfo.setResponsibilityIdentity(identity); - wrapInOkrWorkBaseInfo.setResponsibilityUnitName(unitName); - wrapInOkrWorkBaseInfo.setResponsibilityTopUnitName(topUnitName); - } catch (Exception e) { - check = false; - Exception exception = new WorkResponsibilityInvalidException(e, - cacheImportRowDetail.getResponsibilityIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("系统校验工作责任人发生异常，" + userName + "!"); - } - } else { - check = false; - Exception exception = new WorkResponsibilityEmptyException(); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("责任者[responsibilityEmployeeName]信息为空，无法继续保存工作信息!"); - } - } - - if (check) { - if (cacheImportRowDetail.getCooperateIdentity() != null && !cacheImportRowDetail.getCooperateIdentity().isEmpty()) { - identityNames = cacheImportRowDetail.getCooperateIdentity().split(","); - List _names = new ArrayList<>(); - List _identities = new ArrayList<>(); - List _unitNames = new ArrayList<>(); - List _topUnitNames = new ArrayList<>(); - try { - for (String _identity : identityNames) { - if (okrUserManagerService.getPersonNameByIdentity(_identity) == null) { - throw new Exception("person not exsits, identity:" + _identity); - } - _identities.add( _identity ); - _names.add( okrUserManagerService.getPersonNameByIdentity(_identity) ); - _unitNames.add( okrUserManagerService.getUnitNameByIdentity(_identity) ); - _topUnitNames.add( okrUserManagerService.getTopUnitNameByIdentity(_identity) ); - } - wrapInOkrWorkBaseInfo.setCooperateEmployeeNameList(_names); - wrapInOkrWorkBaseInfo.setCooperateIdentityList(_identities); - wrapInOkrWorkBaseInfo.setCooperateUnitNameList(_unitNames); - wrapInOkrWorkBaseInfo.setCooperateTopUnitNameList(_topUnitNames); - } catch (Exception e) { - check = false; - Exception exception = new WorkCooperateInvalidException(e, - cacheImportRowDetail.getCooperateIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("系统校验工作协助人发生异常，" + userName + "!"); - } - } else { - wrapInOkrWorkBaseInfo.setCooperateIdentityList(new ArrayList<>()); - wrapInOkrWorkBaseInfo.setCooperateEmployeeNameList(new ArrayList<>()); - wrapInOkrWorkBaseInfo.setCooperateUnitNameList(new ArrayList<>()); - wrapInOkrWorkBaseInfo.setCooperateTopUnitNameList(new ArrayList<>()); - } - } - - if (check) { - if (cacheImportRowDetail.getReadLeaderIdentity() != null && !cacheImportRowDetail.getReadLeaderIdentity().isEmpty()) { - userName = ""; - identity = ""; - unitName = ""; - topUnitName = ""; - identityNames = cacheImportRowDetail.getReadLeaderIdentity().split(","); - List _names = new ArrayList<>(); - List _identities = new ArrayList<>(); - List _unitNames = new ArrayList<>(); - List _topUnitNames = new ArrayList<>(); - try { - for (String _identity : identityNames) { - if (okrUserManagerService.getPersonNameByIdentity(_identity) == null) { - throw new Exception("person not exsits, identity:" + _identity); - } - _identities.add( _identity ); - _names.add( okrUserManagerService.getPersonNameByIdentity(_identity) ); - _unitNames.add( okrUserManagerService.getUnitNameByIdentity(_identity) ); - _topUnitNames.add( okrUserManagerService.getTopUnitNameByIdentity(_identity) ); - } - wrapInOkrWorkBaseInfo.setReadLeaderNameList(_names); - wrapInOkrWorkBaseInfo.setReadLeaderIdentityList(_identities); - wrapInOkrWorkBaseInfo.setReadLeaderUnitNameList(_unitNames); - wrapInOkrWorkBaseInfo.setReadLeaderTopUnitNameList(_topUnitNames); - } catch (Exception e) { - check = false; - Exception exception = new WorkReadLeaderInvalidException(e, cacheImportRowDetail.getReadLeaderIdentity()); - result.error(exception); - logger.error(e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("系统校验工作阅知领导信息发生异常，" + identityNames + "!"); - } - } else { - wrapInOkrWorkBaseInfo.setReadLeaderNameList(new ArrayList<>()); - wrapInOkrWorkBaseInfo.setReadLeaderIdentityList(new ArrayList<>()); - wrapInOkrWorkBaseInfo.setReadLeaderUnitNameList(new ArrayList<>()); - wrapInOkrWorkBaseInfo.setReadLeaderTopUnitNameList(new ArrayList<>()); - } - } - - if (check) { - // 校验汇报周期和汇报日期数据，并且补充汇报时间和时间序列 - if (cacheImportRowDetail.getReportCycle() != null - && cacheImportRowDetail.getReportCycle().trim().equals("不汇报")) { - wrapInOkrWorkBaseInfo.setIsNeedReport(false); - wrapInOkrWorkBaseInfo.setReportDayInCycle(null); - wrapInOkrWorkBaseInfo.setReportTimeQue(null); - wrapInOkrWorkBaseInfo.setLastReportTime(null); - wrapInOkrWorkBaseInfo.setNextReportTime(null); - } else if (cacheImportRowDetail.getReportCycle() != null - && cacheImportRowDetail.getReportCycle().trim().equals("每周汇报")) { - if (wrapInOkrWorkBaseInfo.getReportDayInCycle() != null) { - wrapInOkrWorkBaseInfo.setIsNeedReport(true); - // 检验每周汇报日的选择是否正确 - if (wrapInOkrWorkBaseInfo.getReportDayInCycle() >= 1 - && wrapInOkrWorkBaseInfo.getReportDayInCycle() <= 7) { - // 每周1-7 - String reportTimeQue = okrWorkBaseInfoQueryService.getReportTimeQue( - dateOperation.getDateFromString(wrapInOkrWorkBaseInfo.getDeployDateStr()), - wrapInOkrWorkBaseInfo.getCompleteDateLimit(), - wrapInOkrWorkBaseInfo.getReportCycle(), - wrapInOkrWorkBaseInfo.getReportDayInCycle(), reportStartTime); - Date nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime(reportTimeQue, - wrapInOkrWorkBaseInfo.getLastReportTime()); - wrapInOkrWorkBaseInfo.setReportTimeQue(reportTimeQue); - wrapInOkrWorkBaseInfo.setNextReportTime(nextReportTime); - } else { - check = false; - Exception exception = new ReportDayInCycleInvalidException( - wrapInOkrWorkBaseInfo.getReportDayInCycle()); - result.error(exception); - // logger.error( e, effectivePerson, - // request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("每周汇报日选择不正确：" - + wrapInOkrWorkBaseInfo.getReportDayInCycle() + "，无法继续保存工作信息!"); - } - } else { - check = false; - Exception exception = new ReportDayInCycleEmptyException(); - result.error(exception); - // logger.error( e, effectivePerson, request, - // null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("每周汇报日为空，无法继续保存工作信息!"); - } - } else if (cacheImportRowDetail.getReportCycle() != null - && cacheImportRowDetail.getReportCycle().trim().equals("每月汇报")) { - if (cacheImportRowDetail.getReportDayInCycle() != null) { - wrapInOkrWorkBaseInfo.setIsNeedReport(true); - if (wrapInOkrWorkBaseInfo.getReportDayInCycle() >= 1 - && wrapInOkrWorkBaseInfo.getReportDayInCycle() <= 31) { - // 每月1-31，如果选择的日期大于当月最大日期，那么默认定为当月最后一天 - String reportTimeQue = okrWorkBaseInfoQueryService.getReportTimeQue( - dateOperation.getDateFromString(wrapInOkrWorkBaseInfo.getDeployDateStr()), - wrapInOkrWorkBaseInfo.getCompleteDateLimit(), - wrapInOkrWorkBaseInfo.getReportCycle(), - wrapInOkrWorkBaseInfo.getReportDayInCycle(), reportStartTime); - Date nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime(reportTimeQue, - wrapInOkrWorkBaseInfo.getLastReportTime()); - wrapInOkrWorkBaseInfo.setReportTimeQue(reportTimeQue); - wrapInOkrWorkBaseInfo.setNextReportTime(nextReportTime); - } else { - check = false; - Exception exception = new ReportDayInCycleInvalidException( - wrapInOkrWorkBaseInfo.getReportDayInCycle()); - result.error(exception); - // logger.error( e, effectivePerson, - // request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("每月汇报日选择不正确：" - + wrapInOkrWorkBaseInfo.getReportDayInCycle() + "，无法继续保存工作信息!"); - } - } else { - check = false; - Exception exception = new ReportDayInCycleEmptyException(); - result.error(exception); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("每月汇报日期为空，无法继续保存工作信息!"); - } - } else { - check = false; - Exception exception = new ReportCycleInvalidException( cacheImportRowDetail.getReportCycle()); - result.error(exception); - // logger.error( e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription( "汇报周期选择不正确：" + cacheImportRowDetail.getReportCycle() + "，无法继续保存工作信息!"); - } - } - wrapInList.add(wrapInOkrWorkBaseInfo); - } catch (Exception e) { - check = false; - Exception exception = new WorkImportDataCheckException(e); - result.error(exception); - logger.error(e, effectivePerson, request, null); - wrapInOkrWorkBaseInfo.setCheckSuccess("failture"); - wrapInOkrWorkBaseInfo.setDescription("系统在校验所有待保存数据信息时发生未知异常!"); - } - } - - if (!"success".equals(wrapInOkrWorkBaseInfo.getCheckSuccess())) { - errorWrapInList.add(wrapInOkrWorkBaseInfo); - } - } - - if (errorWrapInList != null && errorWrapInList.size() > 0) { - result.error(new Exception("系统数据校验发现不合法数据，需要进一步修改。")); - result.setData(errorWrapInList); - } else { - if (check) { - if (wrapInList != null && !wrapInList.isEmpty()) { - for ( Wi wrapIn : wrapInList ) { - // 创建新的工作信息，保存到数据库 - try { - okrWorkBaseInfo = okrWorkBaseInfoOperationService.save( wrapIn, - wrapIn.getWorkDetail(), wrapIn.getDutyDescription(), wrapIn.getLandmarkDescription(), - wrapIn.getMajorIssuesDescription(), wrapIn.getProgressAction(), wrapIn.getProgressPlan(), - wrapIn.getResultDescription() ); - } catch (Exception e) { - check = false; - Exception exception = new WorkImportDataException(e); - result.error(exception); - logger.error(e, effectivePerson, request, null); - } - } - } - } - } - return result; - } - -public class Wi extends OkrWorkBaseInfo { - - private static final long serialVersionUID = -5076990764713538973L; - - private List workIds = null; - - //工作详细信息数据 - private String workDetail = null;//事项分解 - - private String dutyDescription = null; - - private String landmarkDescription = null; - - private String majorIssuesDescription = null; - - private String progressAction = null; - - private String progressPlan = null; - - private String resultDescription = null; - - private String checkSuccess = "success"; - - private String description = null; - - public List getWorkIds() { - return workIds; - } - - public void setWorkIds(List workIds) { - this.workIds = workIds; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public String getCheckSuccess() { - return checkSuccess; - } - - public void setCheckSuccess(String checkSuccess) { - this.checkSuccess = checkSuccess; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/BaseAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/BaseAction.java deleted file mode 100644 index da1aa5e978..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/BaseAction.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrUserInfoService; -import com.x.okr.assemble.control.service.OkrUserManagerService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoOperationService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; - -public class BaseAction extends StandardJaxrsAction { - protected OkrCenterWorkQueryService okrCenterWorkInfoService = new OkrCenterWorkQueryService(); - protected OkrWorkBaseInfoOperationService okrWorkBaseInfoOperationService = new OkrWorkBaseInfoOperationService(); - protected OkrWorkBaseInfoQueryService okrWorkBaseInfoQueryService = new OkrWorkBaseInfoQueryService(); - protected OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - protected OkrUserInfoService okrUserInfoService = new OkrUserInfoService(); - protected DateOperation dateOperation = new DateOperation(); - protected OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportFileStatus.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportFileStatus.java deleted file mode 100644 index a3b2815ceb..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportFileStatus.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport; - -import java.io.Serializable; -import java.util.List; - -import com.x.base.core.project.gson.GsonPropertyObject; - -public class CacheImportFileStatus extends GsonPropertyObject implements Serializable{ - - private static final long serialVersionUID = 1L; - - private String fileId; - - private String checkStatus = "success"; - - private String message = ""; - - private long rowCount; - - private long errorCount; - - private List detailList; - - public String getFileId() { - return fileId; - } - - public void setFileId(String fileId) { - this.fileId = fileId; - } - - public String getCheckStatus() { - return checkStatus; - } - - public void setCheckStatus(String checkStatus) { - this.checkStatus = checkStatus; - } - - - - public long getRowCount() { - return rowCount; - } - - public void setRowCount(long rowCount) { - this.rowCount = rowCount; - } - - public long getErrorCount() { - return errorCount; - } - - public void setErrorCount(long errorCount) { - this.errorCount = errorCount; - } - - public List getDetailList() { - return detailList; - } - - public void setDetailList(List detailList) { - this.detailList = detailList; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportRowDetail.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportRowDetail.java deleted file mode 100644 index d2f3172a2c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/CacheImportRowDetail.java +++ /dev/null @@ -1,312 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport; - -import java.io.Serializable; -import java.util.Date; - -import com.x.base.core.project.gson.GsonPropertyObject; - -public class CacheImportRowDetail extends GsonPropertyObject implements Serializable{ - - private static final long serialVersionUID = 1L; - - /** - * 工作标题 - */ - private String title = ""; - - /** - * 上级工作ID - */ - private String parentWorkId = ""; - - /** - * 工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - */ - private String workDateTimeType = "长期工作"; - - /** - * 部署者身份 - */ - private String deployerIdentity = ""; - - /** - * 创建者身份 - */ - private String creatorIdentity = ""; - - /** - * 工作完成日期-字符串，显示用：yyyy-mm-dd - */ - private String completeDateLimitStr = ""; - - /** - * 工作完成日期-字符串，显示用：yyyy-mm-dd - */ - private Date completeDateLimit = null; - - /** - * 主责人身份 - */ - private String responsibilityIdentity = ""; - - /** - * 协助人身份，可能多值，用逗号分隔 - */ - private String cooperateIdentity = ""; - - /** - * 阅知领导身份，可能多值，用逗号分隔 - */ - private String readLeaderIdentity = ""; - - /** - * 工作类别 - */ - private String workType = ""; - - /** - * 工作级别 - */ - private String workLevel = ""; - - /** - * 备注说明 - */ - private String description = ""; - - /** - * 工作详细描述 - */ - private String workDetail = ""; - - /** - * 职责描述 - */ - private String dutyDescription = ""; - - /** - * 具体行动举措 - */ - private String progressAction = ""; - - /** - * 里程碑标志说明 - */ - private String landmarkDescription = ""; - - /** - * 交付成果说明 - */ - private String resultDescription = ""; - - /** - * 重点事项说明 - */ - private String majorIssuesDescription = ""; - - /** - * 进展计划时限说明 - */ - private String progressPlan = ""; - - /** - * 汇报周期:不需要汇报|每月汇报|每周汇报 - */ - private String reportCycle = null; - - /** - * 周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00 - */ - private Integer reportDayInCycle = 0; - - /** - * 检查状态 - */ - private String checkStatus = "success"; - - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getParentWorkId() { - return parentWorkId; - } - - public void setParentWorkId(String parentWorkId) { - this.parentWorkId = parentWorkId; - } - - public String getWorkDateTimeType() { - return workDateTimeType; - } - - public void setWorkDateTimeType(String workDateTimeType) { - this.workDateTimeType = workDateTimeType; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getCreatorIdentity() { - return creatorIdentity; - } - - public void setCreatorIdentity(String creatorIdentity) { - this.creatorIdentity = creatorIdentity; - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getCooperateIdentity() { - return cooperateIdentity; - } - - public void setCooperateIdentity(String cooperateIdentity) { - this.cooperateIdentity = cooperateIdentity; - } - - public String getReadLeaderIdentity() { - return readLeaderIdentity; - } - - public void setReadLeaderIdentity(String readLeaderIdentity) { - this.readLeaderIdentity = readLeaderIdentity; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getCheckStatus() { - return checkStatus; - } - - public void setCheckStatus(String checkStatus) { - this.checkStatus = checkStatus; - } - - public String getWorkDetail() { - return workDetail; - } - - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - public String getDutyDescription() { - return dutyDescription; - } - - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - public String getProgressAction() { - return progressAction; - } - - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - public String getLandmarkDescription() { - return landmarkDescription; - } - - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - public String getResultDescription() { - return resultDescription; - } - - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - public String getProgressPlan() { - return progressPlan; - } - - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - public String getReportCycle() { - return reportCycle; - } - - public void setReportCycle(String reportCycle) { - this.reportCycle = reportCycle; - } - - public Integer getReportDayInCycle() { - return reportDayInCycle; - } - - public void setReportDayInCycle(Integer reportDayInCycle) { - this.reportDayInCycle = reportDayInCycle; - } - - public Date getCompleteDateLimit() { - return completeDateLimit; - } - - public void setCompleteDateLimit(Date completeDateLimit) { - this.completeDateLimit = completeDateLimit; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/OkrWorkImportAction.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/OkrWorkImportAction.java deleted file mode 100644 index bed3b32997..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/OkrWorkImportAction.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -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 org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.glassfish.jersey.media.multipart.FormDataParam; - -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -@Path("import") -@JaxrsDescribe("工作信息导入服务") -public class OkrWorkImportAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkImportAction.class); - - @JaxrsMethodDescribe(value = "进行工作信息导入", action = ActionWorkImport.class) - @POST - @Path("center/{centerId}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.MULTIPART_FORM_DATA) - public void importWork(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("中心工作ID") @PathParam("centerId") String centerId, - @JaxrsParameterDescribe("位置") @FormDataParam("site") String site, - @FormDataParam(FILE_FIELD) final byte[] bytes, - @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) { - EffectivePerson effectivePerson = this.effectivePerson(request); - ActionResult result = new ActionResult<>(); - try { - result = new ActionWorkImport().execute(request, effectivePerson, centerId, site, bytes, disposition); - } catch (Exception e) { - result = new ActionResult<>(); - logger.warn("系统根据中心工作ID获取中心工作所有附件信息过程发生异常。"); - logger.error(e, effectivePerson, request, null); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/WorkImportExcelReader.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/WorkImportExcelReader.java deleted file mode 100644 index 6df45cab40..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/WorkImportExcelReader.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.common.excel.reader.IRowReader; -import com.x.okr.assemble.control.ThisApplication; -import org.apache.commons.lang3.StringUtils; - -public class WorkImportExcelReader implements IRowReader{ - - /* 业务逻辑实现方法 - * @see com.eprosun.util.excel.IRowReader#getRows(int, int, java.util.List) - */ - public void getRows( int sheetIndex, int curRow, List colmlist, String fileKey, int startRow ) { - StringBuffer sb = new StringBuffer(); - for( String col : colmlist ){ - if( col == null ){ - col = "null"; - } - if( sb.toString().isEmpty() ){ - sb.append( "["+ col + "]" ); - }else{ - sb.append( ", [" + col + "]" ); - } - } - - if( curRow < startRow ){ - return; - } - - CacheImportFileStatus cacheImportFileStatus = getCacheMap( fileKey ); - - if( cacheImportFileStatus.getDetailList() == null ){ - cacheImportFileStatus.setDetailList( new ArrayList()); - } - - List workDataList = cacheImportFileStatus.getDetailList(); - - if( colmlist!= null && colmlist.size() > 0 ){ - - cacheImportFileStatus.setRowCount( curRow ); - -// String title = ""; //工作标题 - //String parentWorkId = ""; //上级工作ID - //String deployerIdentity = "";//部署者身份 - //String creatorIdentity = "";//创建者身份 - //工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - String workDateTimeType = "长期工作"; - String completeDateLimitStr = ""; //工作完成日期-字符串，显示用：yyyy-mm-dd - String responsibilityIdentity = ""; //主责人身份 - String cooperateIdentity = "";//协助人身份，可能多值，用逗号分隔 - String readLeaderIdentity = ""; //阅知领导身份，可能多值，用逗号分隔 -// String workType = ""; //工作类别 -// String workLevel = "";//工作级别 - String workDetail = ""; //工作详细描述(山西：事项分解及描述) -// String dutyDescription = "";//职责描述 - String progressAction = "";//具体行动举措 - String landmarkDescription = "";//里程碑标志说明 - String resultDescription = "";//交付成果说明 -// String majorIssuesDescription = "";//重点事项说明 - String progressPlan = "";//进展计划时限说明 - String reportCycle = null;//汇报周期:不需要汇报|每月汇报|每周汇报 - //周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00 - String reportDayInCycleStr = null; - Date completeDateLimit = null; - boolean checkSuccess = true; - DateOperation dateOperation = new DateOperation(); - CacheImportRowDetail cacheImportRowDetail = new CacheImportRowDetail(); - if( !colmlist.get(0).isEmpty() && !colmlist.get(2).isEmpty()){ - workDateTimeType = "长期工作"; //工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - cacheImportRowDetail.setWorkDateTimeType(workDateTimeType); - if(ListTools.isNotEmpty(colmlist) ){ - completeDateLimitStr = colmlist.get(0).trim(); //工作完成时限-字符串，显示用：yyyy-mm-dd - try{ - completeDateLimit = dateOperation.getDateFromString( completeDateLimitStr ); - cacheImportRowDetail.setCompleteDateLimit(completeDateLimit); - completeDateLimitStr = dateOperation.getDateStringFromDate( completeDateLimit, "yyyy-MM-dd" ); - cacheImportRowDetail.setCompleteDateLimitStr(completeDateLimitStr); - }catch(Exception e){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作完成时限不是正常的日期格式：" + completeDateLimitStr ); - } - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 1 ){ - reportCycle = colmlist.get(1).trim(); //汇报周期:不需要汇报|每月汇报|每周汇报 - cacheImportRowDetail.setReportCycle(reportCycle); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 2 ){ - reportDayInCycleStr = colmlist.get(2).trim(); //周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00 - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 3 ){ - responsibilityIdentity = colmlist.get(3).trim(); //主责人身份 - cacheImportRowDetail.setResponsibilityIdentity(responsibilityIdentity); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 4 ){ - cooperateIdentity = colmlist.get(4).trim(); //协助人身份，可能多值，用逗号分隔 - cacheImportRowDetail.setCooperateIdentity(cooperateIdentity); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 5 ){ - readLeaderIdentity = colmlist.get(5).trim(); //阅知领导身份，可能多值，用逗号分隔 - cacheImportRowDetail.setReadLeaderIdentity(readLeaderIdentity); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 6 ){ - workDetail = colmlist.get(6).trim(); //工作详细描述（山西：事项分解及描述） - cacheImportRowDetail.setWorkDetail(workDetail); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 7 ){ - progressAction = colmlist.get(7).trim(); //具体行动举措 - cacheImportRowDetail.setProgressAction(progressAction); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 8 ){ - landmarkDescription = colmlist.get(8).trim(); //里程碑标志说明（山西：预期里程碑(阶段性)结果标志） - cacheImportRowDetail.setLandmarkDescription(landmarkDescription); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 9 ){ - progressPlan = colmlist.get(9).trim(); //进展计划时限说明 - cacheImportRowDetail.setProgressPlan(progressPlan); - } - if( ListTools.isNotEmpty(colmlist) && colmlist.size() > 10 ){ - resultDescription = colmlist.get(10).trim(); //交付成果说明 - cacheImportRowDetail.setResultDescription(resultDescription); - } - - //检查所有导入的参数的合法性 - if( checkSuccess && (StringUtils.isEmpty(completeDateLimitStr)) ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作完成时限不能为空！" ); - } - if( checkSuccess && ( StringUtils.isEmpty(reportCycle) ) ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作汇报周期不能为空！" ); - } - if( checkSuccess && ( StringUtils.isEmpty( reportDayInCycleStr ) ) ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作汇报日期不能为空！" ); - } - if( checkSuccess && ( StringUtils.isEmpty( responsibilityIdentity ) ) ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作负责人身份不能为空！" ); - } - if( checkSuccess && ( StringUtils.isEmpty( workDetail ) ) ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "事项分解及描述不能为空！" ); - } - if( checkSuccess && ( StringUtils.isEmpty( progressAction ) ) ){ - progressAction = "暂无具体行动举措。"; - } - - //检查部分参数的有效性 - if( checkSuccess ){ - try{ - cacheImportRowDetail.setReportDayInCycle(Integer.parseInt( reportDayInCycleStr )); - }catch(Exception e){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作汇报日期不是数字：" + reportDayInCycleStr ); - } - } - - if( checkSuccess ){ - if( "每月汇报".equals( reportCycle )){ - if( cacheImportRowDetail.getReportDayInCycle() < 1 || cacheImportRowDetail.getReportDayInCycle() > 31 ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "每月工作汇报日期不正常：" + cacheImportRowDetail.getReportDayInCycle()); - } - }else if( "每周汇报".equals( reportCycle )){ - if( cacheImportRowDetail.getReportDayInCycle() < 1 || cacheImportRowDetail.getReportDayInCycle() > 7 ){ - checkSuccess = false; - cacheImportRowDetail.setDescription( "每周工作汇报日期不正常：" + cacheImportRowDetail.getReportDayInCycle()); - } - //用户填写的是 1-周一， 7-周日 - //实际换算，2-周一，3-周二，4-周三，5-周四，6-周五，7-周六，1-周日 - if( cacheImportRowDetail.getReportDayInCycle() == 1 ){//周一 - cacheImportRowDetail.setReportDayInCycle(2); - }else if( cacheImportRowDetail.getReportDayInCycle() == 2 ){//周二 - cacheImportRowDetail.setReportDayInCycle(3); - }else if( cacheImportRowDetail.getReportDayInCycle() == 3 ){//周三 - cacheImportRowDetail.setReportDayInCycle(4); - }else if( cacheImportRowDetail.getReportDayInCycle() == 4 ){//周四 - cacheImportRowDetail.setReportDayInCycle(5); - }else if( cacheImportRowDetail.getReportDayInCycle() == 5 ){//周五 - cacheImportRowDetail.setReportDayInCycle(6); - }else if( cacheImportRowDetail.getReportDayInCycle() == 6 ){//周六 - cacheImportRowDetail.setReportDayInCycle(7); - }else if( cacheImportRowDetail.getReportDayInCycle() == 7 ){//周日 - cacheImportRowDetail.setReportDayInCycle(1); - } - }else{ - checkSuccess = false; - cacheImportRowDetail.setDescription( "工作汇报周期不正常：" + reportCycle ); - } - } - if( checkSuccess ){ - cacheImportRowDetail.setCheckStatus( "success" ); //设置数据检查状态为正常 - }else{ - cacheImportFileStatus.setErrorCount( ( cacheImportFileStatus.getErrorCount() + 1 ) ); - cacheImportRowDetail.setCheckStatus( "failture" ); //设置数据检查状态为正常 - } - workDataList.add( cacheImportRowDetail ); - } - } - } - - private CacheImportFileStatus getCacheMap( String fileKey ) { - Map cacheMap = null; - if ( ThisApplication.getImportFileStatusMap() == null ) { - ThisApplication.setImportFileStatusMap( new HashMap() ); - } - cacheMap = ThisApplication.getImportFileStatusMap(); - if( cacheMap.get( fileKey ) == null ){ - cacheMap.put( fileKey, new CacheImportFileStatus() ); - } - return cacheMap.get( fileKey ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkNotExistsException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkNotExistsException.java deleted file mode 100644 index 7b432fa3b7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkNotExistsException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class CenterWorkNotExistsException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public CenterWorkNotExistsException( String id ) { - super("指定ID的中心工作记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkQueryByIdException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkQueryByIdException.java deleted file mode 100644 index 717c24792a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/CenterWorkQueryByIdException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class CenterWorkQueryByIdException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public CenterWorkQueryByIdException( Throwable e, String id ) { - super("查询指定ID的中心工作信息时发生异常。ID：" + id, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ExcelReadException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ExcelReadException.java deleted file mode 100644 index fe9ff6491e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ExcelReadException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ExcelReadException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ExcelReadException( Throwable e ) { - super("系统从EXCEL文件获取数据时发生异常." , e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/GetOkrUserCacheException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/GetOkrUserCacheException.java deleted file mode 100644 index 49a689f340..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/GetOkrUserCacheException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class GetOkrUserCacheException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public GetOkrUserCacheException( Throwable e, String userName, String proxyIdentity ) { - super("根据员工和代理员工姓名获取OKR系统登录信息对象时发生异常.!用户:'" + userName +"'，代理者身份：'"+ proxyIdentity +"'.", e ); - } - - public GetOkrUserCacheException( Throwable e, String userName ) { - super("根据员工姓名获取OKR系统登录信息对象时发生异常!用户:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/NoDataException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/NoDataException.java deleted file mode 100644 index ea913242fe..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/NoDataException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class NoDataException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public NoDataException() { - super("未获取到任何需要保存的数据."); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportCycleInvalidException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportCycleInvalidException.java deleted file mode 100644 index 5c9b4ce15e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportCycleInvalidException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ReportCycleInvalidException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ReportCycleInvalidException( String cycle ) { - super("汇报周期选择不正确："+ cycle +"，无法继续保存工作信息!" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleEmptyException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleEmptyException.java deleted file mode 100644 index 08319f8bf9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleEmptyException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ReportDayInCycleEmptyException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ReportDayInCycleEmptyException() { - super("每周汇报日为空，无法继续保存工作信息!" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleInvalidException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleInvalidException.java deleted file mode 100644 index ac39e1770c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/ReportDayInCycleInvalidException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class ReportDayInCycleInvalidException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public ReportDayInCycleInvalidException( int cycle ) { - super("每周汇报日选择不正确："+ cycle +"，无法继续保存工作信息!" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserNoLoginException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserNoLoginException.java deleted file mode 100644 index 784049d73e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserNoLoginException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class UserNoLoginException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public UserNoLoginException( String userName ) { - super("用户未正常登录或者登录信息过期，请重新登录OKR系统!用户:'" + userName +"'." ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserUnitQueryException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserUnitQueryException.java deleted file mode 100644 index f72bf15527..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/UserUnitQueryException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class UserUnitQueryException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public UserUnitQueryException( Throwable e, String userName ) { - super("系统通过操作用户查询用户身份和组织信息时发生异常!Person:'" + userName +"'.", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitEmptyException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitEmptyException.java deleted file mode 100644 index c291377b56..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitEmptyException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkCompleteDateLimitEmptyException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkCompleteDateLimitEmptyException() { - super("工作完成时限为空，无法进行工作保存。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitFormatException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitFormatException.java deleted file mode 100644 index 470c59b564..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCompleteDateLimitFormatException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkCompleteDateLimitFormatException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkCompleteDateLimitFormatException( Throwable e, String date ) { - super("工作完成时限格式不正确，无法进行工作保存。Date：" + date, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCooperateInvalidException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCooperateInvalidException.java deleted file mode 100644 index 52532a10c0..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkCooperateInvalidException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkCooperateInvalidException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkCooperateInvalidException( Throwable e, String person ) { - super("系统根据用户所选择的协助者身份为工作信息组织协助者信息时发生异常。Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataCheckException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataCheckException.java deleted file mode 100644 index 896a5714be..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataCheckException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkImportDataCheckException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkImportDataCheckException( Throwable e ) { - super("系统在校验所有待保存数据信息时发生未知异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataException.java deleted file mode 100644 index 83376cdc8d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkImportDataException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkImportDataException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkImportDataException( Throwable e ) { - super("系统在导入所有待保存数据信息时发生未知异常。", e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkNotExistsException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkNotExistsException.java deleted file mode 100644 index f763d43229..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkNotExistsException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkNotExistsException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkNotExistsException( String id ) { - super("指定ID的工作记录不存在。ID：" + id ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkReadLeaderInvalidException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkReadLeaderInvalidException.java deleted file mode 100644 index 07e8f51ab6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkReadLeaderInvalidException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkReadLeaderInvalidException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkReadLeaderInvalidException( Throwable e, String person ) { - super("系统根据用户所选择的阅知者身份为工作信息组织阅知者信息时发生异常。Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityEmptyException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityEmptyException.java deleted file mode 100644 index 2cb57660dc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityEmptyException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkResponsibilityEmptyException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkResponsibilityEmptyException() { - super("工作责任者身份为空，无法进行工作保存。" ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityInvalidException.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityInvalidException.java deleted file mode 100644 index 71d8151e2b..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/workimport/exception/WorkResponsibilityInvalidException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.okr.assemble.control.jaxrs.workimport.exception; - -import com.x.base.core.project.exception.PromptException; - -public class WorkResponsibilityInvalidException extends PromptException { - - private static final long serialVersionUID = 1859164370743532895L; - - public WorkResponsibilityInvalidException( Throwable e, String person ) { - super("系统根据用户所选择的责任者身份为工作信息组织责任者信息时发生异常。Person:" + person, e ); - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/ErrorIdentityCheckTask.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/ErrorIdentityCheckTask.java deleted file mode 100644 index 2d74364cac..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/ErrorIdentityCheckTask.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import org.quartz.JobExecutionContext; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.control.service.OkrSystemIdentityOperatorService; - -/** - * 定时代理，定时对系统中涉及到的身份信息进行检查 - * - * @author LIYI - * - */ -public class ErrorIdentityCheckTask extends AbstractJob { - private static Logger logger = LoggerFactory.getLogger(ErrorIdentityCheckTask.class); - private OkrSystemIdentityOperatorService okrSystemIdentityOperatorService = new OkrSystemIdentityOperatorService(); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - try { - okrSystemIdentityOperatorService.checkAllAbnormalIdentityInSystem(); - logger.info("Timertask_ErrorIdentityCheckTask completed and excute success."); - } catch (Exception e) { - logger.warn("Timertask_ErrorIdentityCheckTask excute got an exception."); - logger.error(e); - } - - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_CenterWorkCount.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_CenterWorkCount.java deleted file mode 100644 index 400a40a72d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_CenterWorkCount.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import java.util.ArrayList; -import java.util.List; - -import org.quartz.JobExecutionContext; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.control.service.OkrCenterWorkQueryService; - -/** - * 定时代理，对中心工作的工作总数，完成情况以及中心工作的状态进行统计分析。 1、查询所有未完成的中心工作 - * 2、遍历所有中心工作，对中心工作所有的具体工作进行统计，按状态进行数量查询 - * - * @author LIYI - * - */ -public class St_CenterWorkCount extends AbstractJob { - - private static Logger logger = LoggerFactory.getLogger(St_CenterWorkCount.class); - private OkrCenterWorkQueryService okrCenterWorkInfoService = new OkrCenterWorkQueryService(); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - List ids = null; - // 草稿|待审核|待确认|执行中|已完成|已撤消 - List processStatus = new ArrayList(); - List status = new ArrayList(); - - // 1、查询所有未完成的中心工作 - status.add("正常"); - processStatus.add("执行中"); - try { - ids = okrCenterWorkInfoService.listAllProcessingCenterWorkIds(processStatus, status); - } catch (Exception e) { - logger.warn("system query uncomplete center work ids got an exception."); - logger.error(e); - } - - if (ids != null && !ids.isEmpty()) { - for (String centerId : ids) { - try { - okrCenterWorkInfoService.countWorkWithCenterId(centerId, status); - } catch (Exception e) { - logger.warn("system count work info by center info got an exception."); - logger.error(e); - } - } - } - logger.info("Timertask OKR_St_CenterWorkCount completed and excute success."); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportContent.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportContent.java deleted file mode 100644 index 1ef25be59e..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportContent.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.control.service.ExcuteSt_WorkReportContentService; - -/** - * 定时代理，对工作的汇报情况进行统计分析。 1、遍历所有未归档的工作，以工作为记录维度 ,有多少工作就有多少条记录 2、分析当前这一周的工作汇报情况 - * - * @author LIYI - * - */ -public class St_WorkReportContent extends AbstractJob { - - private static Logger logger = LoggerFactory.getLogger(St_WorkReportContent.class); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - try { - new ExcuteSt_WorkReportContentService().execute(); - logger.info("Timertask OKR_St_WorkReportContent completed and excute success."); - } catch (Exception e) { - logger.error(e); - throw new JobExecutionException(e); - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportStatus.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportStatus.java deleted file mode 100644 index c14c2a5c3d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/St_WorkReportStatus.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.control.service.ExcuteSt_WorkReportStatusService; - -/** - * 定时代理，对工作的汇报提交情况进行统计分析 - * - * 1、遍历所有未归档的工作 2、分析从工作开始日期到工作结束日期之间 所有周的工作汇报提交情况 - * - * @author LIYI - * - */ -public class St_WorkReportStatus extends AbstractJob { - - private static Logger logger = LoggerFactory.getLogger(St_WorkReportContent.class); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - try { - new ExcuteSt_WorkReportStatusService().execute(); - logger.info("Timertask OKR_St_WorkReportStatus completed and excute success."); - } catch (Exception e) { - logger.error(e); - throw new JobExecutionException(e); - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkProgressConfirm.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkProgressConfirm.java deleted file mode 100644 index 85e24bb797..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkProgressConfirm.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import java.util.List; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.service.OkrConfigSystemService; -import com.x.okr.assemble.control.service.OkrWorkBaseInfoQueryService; - -/** - * 定时代理，定时分析所有未完成的工作的完成进度，将分析结果更新到工作信息里，每天运行一次 - * 此工作与系统配置中的参数REPORT_PROGRESS有关： - * 1、如果REPORT_PROGRESS的值为OPEN，那么工作完成进度需要用户主动汇报，工作完成进度以最后一次用户提交的汇报中填写的进度百分比为准， - * 工作是否已经完成，也由用户汇报中的相应数据确定。 - * 2、如果REPORT_PROGRESS的值为CLOSE，那么用户是不需要汇报工作进度的，工作完成进度由系统根据工作开始时间，完成时限和当前的时间定期分析。 - * 如果当前时间已经超过或者等于完成时限，那么工作被视为已经完成。此设置下，工作无超期的概念。 - * - * @author LIYI - * - */ -public class WorkProgressConfirm extends AbstractJob { - - private static Logger logger = LoggerFactory.getLogger( WorkProgressConfirm.class ); - private OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - private DateOperation dateOperation = new DateOperation(); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - String report_progress = null; - String nowDateTime = dateOperation.getNowDateTime(); - List ids = null; - Integer maxWhileCount = 10; - Integer nowWhileCount = 0; - boolean check = true; - - //此处编写定时任务的业务逻辑 - try { - report_progress = okrConfigSystemService.getValueWithConfigCode( "REPORT_PROGRESS" ); - if( report_progress == null || report_progress.isEmpty() ){ - report_progress = "CLOSE"; - } - } catch (Exception e) { - report_progress = "CLOSE"; - logger.warn( "system get config got an exception." ); - logger.error(e); - throw new JobExecutionException(e); - } - - //查询所有未完成工作的ID列表, isCompleted = false, progressAnalyseTime不是当前的时间缀 - try { - ids = okrWorkBaseInfoService.listIdsForNeedProgressAnalyse( nowDateTime, 500 ); - } catch (Exception e) { - check = true; - logger.warn( "system list ids for need progress analyse got an exceptin." ); - logger.error(e); - throw new JobExecutionException(e); - } - - if( check ){ - while( ids != null && !ids.isEmpty() ){ - nowWhileCount ++ ; - //logger.info( "第"+nowWhileCount+"次查询需要分析的工作列表......" ); - if( nowWhileCount > maxWhileCount ){ - break; - } - //根据参数REPORT_PROGRESS的值来进行不同的工作进度分析逻辑。 - for( String id : ids ){ - try { - okrWorkBaseInfoService.analyseWorkProgress( id, null, report_progress, nowDateTime ); - } catch (Exception e) { - logger.warn( "system analyse work progres got an exceptin." ); - logger.error(e); - } - } - try { - ids = okrWorkBaseInfoService.listIdsForNeedProgressAnalyse( nowDateTime, 500 ); - } catch (Exception e) { - check = true; - logger.warn( "system list ids for need progress analyse got an exceptin." ); - logger.error(e); - break; - } - } - } - logger.info( "Timertask OKR_WorkProgressConfirm completed and excute success." ); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCollectCreate.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCollectCreate.java deleted file mode 100644 index 7b48ef60ef..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCollectCreate.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.control.service.OkrWorkReportTaskCollectService; - -/** - * 定时代理，定时分析所有员工的工作汇报汇总待办是否正常 - * - * @author LIYI - * - */ -public class WorkReportCollectCreate extends AbstractJob { - - private static Logger logger = LoggerFactory.getLogger(WorkReportCollectCreate.class); - private OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - - // 调用服务去核对汇总待办 - try { - okrWorkReportTaskCollectService.checkAllReportCollectTask(); - logger.info("Timertask OKR_WorkReportCollectCreate completed and excute success."); - } catch (Exception e) { - logger.warn("系统核对工作汇报待办汇总发生异常。"); - logger.error(e); - throw new JobExecutionException(e); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCreate.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCreate.java deleted file mode 100644 index e1984accf4..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/WorkReportCreate.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.x.okr.assemble.control.schedule; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.schedule.AbstractJob; -import com.x.okr.assemble.control.service.ExcuteWorkReportCreateService; - -/** - * 定时代理，定时对需要汇报的工作发起工作汇报拟稿的待办 - * - * @author LIYI - * - */ -public class WorkReportCreate extends AbstractJob { - - private static Logger logger = LoggerFactory.getLogger(ExcuteWorkReportCreateService.class); - - @Override - public void schedule(JobExecutionContext jobExecutionContext) throws Exception { - try { - new ExcuteWorkReportCreateService().execute(); - logger.info("Timertask WorkReportCreate completed and excute success."); - } catch (Exception e) { - logger.error(e); - throw new JobExecutionException(e); - } - - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/BaseWorkReportStatisticEntity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/BaseWorkReportStatisticEntity.java deleted file mode 100644 index b8730904aa..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/BaseWorkReportStatisticEntity.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.x.okr.assemble.control.schedule.entity; - -import java.util.List; - -public class BaseWorkReportStatisticEntity { - - private String reportId = null; - - private String reportStatus = "未提交汇报"; - - /** - * 截止目前完成情况 - */ - private String progressDescription = ""; - /** - * 后续工作计划 - */ - private String workPlan = ""; - /** - * 下一步工作要点及需求 - * 工作要点及需求 - */ - private String workPointAndRequirements = ""; - /** - * 督办评价 - */ - private String adminSuperviseInfo = ""; - - /** - * 工作汇报备注信息 - */ - private String reportMemo = ""; - - /** - * 领导评价 - */ - private List opinions = null; - - public String getReportStatus() { - return reportStatus; - } - public String getProgressDescription() { - return progressDescription; - } - public String getWorkPlan() { - return workPlan; - } - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - public List getOpinions() { - return opinions; - } - public void setReportStatus(String reportStatus) { - this.reportStatus = reportStatus; - } - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - public void setOpinions( List opinions ) { - this.opinions = opinions; - } - public String getReportMemo() { - return reportMemo; - } - public void setReportMemo(String reportMemo) { - this.reportMemo = reportMemo; - } - public String getReportId() { - return reportId; - } - public void setReportId(String reportId) { - this.reportId = reportId; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/CenterWorkReportStatisticEntity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/CenterWorkReportStatisticEntity.java deleted file mode 100644 index 8cae5c1288..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/CenterWorkReportStatisticEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.x.okr.assemble.control.schedule.entity; - -import java.util.List; - -public class CenterWorkReportStatisticEntity { - private String workTypeName = ""; - private String centerId = ""; - private String centerTitle = ""; - private List workReportStatisticEntityList = null; - - public String getWorkTypeName() { - return workTypeName; - } - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - public String getCenterId() { - return centerId; - } - public void setCenterId(String centerId) { - this.centerId = centerId; - } - public String getCenterTitle() { - return centerTitle; - } - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - public List getWorkReportStatisticEntityList() { - return workReportStatisticEntityList; - } - public void setWorkReportStatisticEntityList(List workReportStatisticEntityList) { - this.workReportStatisticEntityList = workReportStatisticEntityList; - } - - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkBaseReportSubmitEntity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkBaseReportSubmitEntity.java deleted file mode 100644 index e82b6e6bfa..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkBaseReportSubmitEntity.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.x.okr.assemble.control.schedule.entity; - -import java.util.Date; - -import com.x.base.core.project.annotation.FieldDescribe; - -public class WorkBaseReportSubmitEntity { - - @FieldDescribe( "本周期开始日期:yyyy-mm-dd" ) - private String startDate = "1999-01-01"; - - @FieldDescribe( "本周期结束日期:yyyy-mm-dd" ) - private String endDate = "1999-01-01"; - - @FieldDescribe( "工作汇报周期: WEEK|MONTH|QUARTER" ) - private String cycleType = "WEEK"; - - @FieldDescribe( "本期(开始结束时间)在自然年度中的位置:比如第3周，第2个月" ) - private Integer cycleNumber = 1; - - @FieldDescribe( "本期已经提交的汇报ID" ) - private String reportId = null; - - @FieldDescribe( "工作汇报提交时间." ) - private Date submitTime = null; - - @FieldDescribe( "工作汇报内容是否已经完成: 0-未提交(或者未填写内容)|1-已提交(或者已经填写内容未提交)|-1-无须汇报." ) - private Integer reportStatus = -1; - - @FieldDescribe( "说明备注,一般记录错误." ) - private String description = null; - - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } - - public String getCycleType() { - return cycleType; - } - - public void setCycleType(String cycleType) { - this.cycleType = cycleType; - } - - public Integer getCycleNumber() { - return cycleNumber; - } - - public void setCycleNumber(Integer cycleNumber) { - this.cycleNumber = cycleNumber; - } - - public String getReportId() { - return reportId; - } - - public void setReportId(String reportId) { - this.reportId = reportId; - } - - public Date getSubmitTime() { - return submitTime; - } - - public void setSubmitTime(Date submitTime) { - this.submitTime = submitTime; - } - - public Integer getReportStatus() { - return reportStatus; - } - - public void setReportStatus(Integer reportStatus) { - this.reportStatus = reportStatus; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkReportProcessOpinionEntity.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkReportProcessOpinionEntity.java deleted file mode 100644 index 7d7687d416..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/schedule/entity/WorkReportProcessOpinionEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.x.okr.assemble.control.schedule.entity; - -public class WorkReportProcessOpinionEntity { - - private String opinion = ""; - private String processorName = ""; - private String processorUnitName = ""; - private String processorTopUnitName = ""; - private String processTimeStr = ""; - public String getOpinion() { - return opinion; - } - public void setOpinion(String opinion) { - this.opinion = opinion; - } - public String getProcessorName() { - return processorName; - } - public void setProcessorName(String processorName) { - this.processorName = processorName; - } - public String getProcessorUnitName() { - return processorUnitName; - } - public void setProcessorUnitName(String processorUnitName) { - this.processorUnitName = processorUnitName; - } - public String getProcessorTopUnitName() { - return processorTopUnitName; - } - public void setProcessorTopUnitName(String processorTopUnitName) { - this.processorTopUnitName = processorTopUnitName; - } - public String getProcessTimeStr() { - return processTimeStr; - } - public void setProcessTimeStr(String processTimeStr) { - this.processTimeStr = processTimeStr; - } - - - - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportContentService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportContentService.java deleted file mode 100644 index 78ccf697b3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportContentService.java +++ /dev/null @@ -1,298 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.google.gson.Gson; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.schedule.entity.BaseWorkReportStatisticEntity; -import com.x.okr.assemble.control.schedule.entity.WorkReportProcessOpinionEntity; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class ExcuteSt_WorkReportContentService { - private static Logger logger = LoggerFactory.getLogger( ExcuteSt_WorkReportContentService.class); - private OkrStatisticReportContentService okrStatisticReportContentService = new OkrStatisticReportContentService(); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - private OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - private OkrWorkReportDetailInfoService okrWorkReportDetailInfoService = new OkrWorkReportDetailInfoService(); - private OkrWorkReportProcessLogService okrWorkReportProcessLogService = new OkrWorkReportProcessLogService(); - private DateOperation dateOperation = new DateOperation(); - - public void execute() { - - List workIds = null; - String status = "All";// 如果不需要在统计里展示 ，就应该为已归档 - try { - workIds = okrWorkBaseInfoService.listAllDeployedWorkIds( null, status ); - } catch (Exception e) { - logger.warn("ExcuteSt_WorkReportContentService service list all no archive work ids got an exception." ); - logger.error(e); - } - if (workIds != null && !workIds.isEmpty()) { - analyseWorksReportContent( workIds ); - } - } - - public void executeAll() { - - List workIds = null; - try { - workIds = okrWorkBaseInfoService.listAllDeployedWorkIds( null, null ); - } catch (Exception e) { - logger.warn("ExcuteSt_WorkReportContentService service list all no archive work ids got an exception." ); - logger.error(e); - } - if (workIds != null && !workIds.isEmpty()) { - analyseWorksReportContent( workIds ); - } - } - - /** - * 分析所有工作的工作汇报情况数据 - * @param workIds - */ - public void analyseWorksReportContent( List workIds ) { - if( workIds == null || workIds.isEmpty() ){ - return; - } - List opinions = null; - OkrStatisticReportContent statisticReportContent = null; - BaseWorkReportStatisticEntity reportStatisticEntity = null; - OkrWorkBaseInfo work = null; - Boolean check = true; - - Integer weekNumber = dateOperation.getWeekNumOfYear(new Date());// 获取本周在全年中所在周期数 - Integer month = dateOperation.getMonthNumber(new Date());// 获取月份 - Integer year = dateOperation.getYearNumber( new Date() );// 获取月份 - Date now = new Date(); - String statisticDate = null; - String opinionJson = null; - Gson gson = XGsonBuilder.instance(); - - try { - statisticDate = dateOperation.getDateStringFromDate( now, "yyyy-MM-dd"); - } catch (Exception e ) { - logger.warn( "system format date got an exception." ); - logger.error(e); - } - - if( check ){ - for( String workId : workIds ){ - statisticReportContent = new OkrStatisticReportContent(); - try { - work = okrWorkBaseInfoService.get( workId ); - if( work != null ){ - opinionJson = null; - reportStatisticEntity = analyseWorkReport( work ); - - statisticReportContent.setStatisticTime( now ); - statisticReportContent.setStatisticTimeFlag( statisticDate ); - statisticReportContent.setCenterId( work.getCenterId() ); - statisticReportContent.setCenterTitle( work.getCenterTitle() ); - if( work.getParentWorkId() != null && !work.getParentWorkId().isEmpty() && work.getParentWorkId().trim().length() > 1 ){ - statisticReportContent.setParentId( work.getParentWorkId() ); - }else{ - statisticReportContent.setParentId( null ); - } - statisticReportContent.setWorkId( work.getId() ); - statisticReportContent.setWorkTitle( work.getTitle() ); - statisticReportContent.setWorkType( work.getWorkType() ); - statisticReportContent.setWorkLevel( work.getWorkLevel() ); - statisticReportContent.setIsCompleted( work.getIsCompleted() ); - statisticReportContent.setIsOverTime( work.getIsOverTime() ); - - statisticReportContent.setStatisticYear( year ); - statisticReportContent.setStatisticMonth( month ); - statisticReportContent.setStatisticWeek( weekNumber ); - statisticReportContent.setCycleType( work.getReportCycle() ); - statisticReportContent.setReportDayInCycle( work.getReportDayInCycle() ); - statisticReportContent.setReportId( reportStatisticEntity.getReportId() ); - statisticReportContent.setResponsibilityTopUnitName( work.getResponsibilityTopUnitName() ); - statisticReportContent.setResponsibilityEmployeeName( work.getResponsibilityEmployeeName() ); - statisticReportContent.setResponsibilityIdentity( work.getResponsibilityIdentity() ); - statisticReportContent.setResponsibilityUnitName( work.getResponsibilityUnitName() ); - statisticReportContent.setReportStatus( reportStatisticEntity.getReportStatus() ); - statisticReportContent.setWorkPlan( reportStatisticEntity.getWorkPlan() ); - statisticReportContent.setAdminSuperviseInfo( reportStatisticEntity.getAdminSuperviseInfo() ); - statisticReportContent.setProgressDescription( reportStatisticEntity.getProgressDescription() ); - statisticReportContent.setWorkPointAndRequirements( reportStatisticEntity.getWorkPointAndRequirements() ); - statisticReportContent.setMemo( reportStatisticEntity.getReportMemo() ); - statisticReportContent.setWorkProcessStatus( work.getWorkProcessStatus() ); - statisticReportContent.setStatus( work.getStatus() ); - opinions = reportStatisticEntity.getOpinions(); - if( opinions != null && !opinions.isEmpty() ){ - opinionJson = gson.toJson( opinions ); - } - if( opinionJson == null || opinionJson.isEmpty() ){ - opinionJson = "{}"; - } - statisticReportContent.setOpinion( opinionJson ); - - okrStatisticReportContentService.save( statisticReportContent ); - }else{ - throw new Exception("work is not exists! workId:" + workId ); - } - } catch ( Exception e ) { - logger.warn( "system save work report content got an exception." ); - logger.error(e); - } - } - } - } - - private BaseWorkReportStatisticEntity analyseWorkReport( OkrWorkBaseInfo work ) { - Integer weekNumber = dateOperation.getWeekNumOfYear(new Date());// 获取本周在全年中所在周期数 - Integer month = dateOperation.getMonthNumber( new Date() );// 获取月份 - Integer reportWeekNumber = 0; - Integer reportMonth = 0; - List ids = null; - List workReportProcessOpinionEntityList = null; - List okrWorkReportProcessLogList = null; - BaseWorkReportStatisticEntity workReportStatisticEntity = null; - WorkReportProcessOpinionEntity workReportProcessOpinionEntity = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - workReportProcessOpinionEntityList = new ArrayList(); - workReportStatisticEntity = new BaseWorkReportStatisticEntity(); - - - // 查询该工作最近一次的汇报基础信息,不是草稿，一定要有提交时间数据 - try { - okrWorkReportBaseInfo = okrWorkReportQueryService.getLastReportBaseInfo( work.getId() ); - } catch (Exception e) { - logger.warn("system get last report info by work id with id got an exception." ); - logger.error(e); - } - - // 判断工作最近一次的汇报时间是否是本周，或者大于本周，如果已经完成，则取最后一次汇报 - if (okrWorkReportBaseInfo != null && okrWorkReportBaseInfo.getSubmitTime() != null) { - reportWeekNumber = dateOperation.getWeekNumOfYear(okrWorkReportBaseInfo.getSubmitTime()); - reportMonth = dateOperation.getMonthNumber(okrWorkReportBaseInfo.getSubmitTime()); - } - - // 不需要汇报|每月汇报|每周汇报 - if ("每月汇报".equals( work.getReportCycle()) ) { - // 如果最近一次的汇报时间是本月，那么查询该汇报的详细 信息。 - // 看看汇报所在的周期是否大于或者等于当前月份，或者工作是否已经完成 - if ( reportMonth >= month || "已完成".equals( work.getWorkProcessStatus()) || work.getIsCompleted() ) { - if ( "已完成".equals( work.getWorkProcessStatus()) || work.getIsCompleted() ) { - workReportStatisticEntity.setReportStatus("工作已完成"); - } else { - workReportStatisticEntity.setReportStatus("已提交汇报"); - } - // 将当前汇报作为最终汇报内容,获取汇报详细内容 - if (okrWorkReportBaseInfo != null) { - workReportStatisticEntity.setReportId( okrWorkReportBaseInfo.getId() ); - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get(okrWorkReportBaseInfo.getId()); - } catch (Exception e) { - logger.warn("system get okrWorkReportDetailInfo by id got an exception. " ); - logger.error( e ); - } - // 查询汇报的所有处理记录，获取所有的领导审核意见 - try { - ids = okrWorkReportProcessLogService.listByReportId(okrWorkReportBaseInfo.getId()); - } catch (Exception e) { - logger.warn("system list workReportProcessLog ids by workReport id got an exception. " ); - logger.error( e ); - } - try { - okrWorkReportProcessLogList = okrWorkReportProcessLogService.list(ids); - } catch (Exception e) { - logger.warn("system list workReportProcessLog by ids got an exception. " ); - logger.error(e); - } - } - - if ( okrWorkReportDetailInfo != null ) { - workReportStatisticEntity.setWorkPlan( okrWorkReportDetailInfo.getWorkPlan() ); - workReportStatisticEntity.setProgressDescription(okrWorkReportDetailInfo.getProgressDescription()); - workReportStatisticEntity.setWorkPointAndRequirements(okrWorkReportDetailInfo.getWorkPointAndRequirements()); - workReportStatisticEntity.setAdminSuperviseInfo(okrWorkReportDetailInfo.getAdminSuperviseInfo()); - } - - if (okrWorkReportProcessLogList != null && !okrWorkReportProcessLogList.isEmpty()) { - // 组织所有的审核意见 - for (OkrWorkReportProcessLog okrWorkReportProcessLog : okrWorkReportProcessLogList) { - if ( "领导批示".equals(okrWorkReportProcessLog.getActivityName()) && "正常".equals(okrWorkReportProcessLog.getStatus())) { - workReportProcessOpinionEntity = new WorkReportProcessOpinionEntity(); - workReportProcessOpinionEntity.setOpinion(okrWorkReportProcessLog.getOpinion()); - workReportProcessOpinionEntity.setProcessorTopUnitName(okrWorkReportProcessLog.getProcessorTopUnitName()); - workReportProcessOpinionEntity.setProcessorName(okrWorkReportProcessLog.getProcessorName()); - workReportProcessOpinionEntity.setProcessorUnitName(okrWorkReportProcessLog.getProcessorUnitName()); - workReportProcessOpinionEntity.setProcessTimeStr(okrWorkReportProcessLog.getProcessTimeStr()); - workReportProcessOpinionEntityList.add(workReportProcessOpinionEntity); - workReportStatisticEntity.setOpinions(workReportProcessOpinionEntityList); - } - } - } - } - } else if ("每周汇报".equals( work.getReportCycle()) ) { - // 如果最近一次的汇报时间是本周，那么查询该汇报的详细 信息。 - // 看看汇报所在的周期是否大于或者等于当前周数，或者工作是否已经完成 - if (reportWeekNumber >= weekNumber || "已完成".equals( work.getWorkProcessStatus()) || work.getIsCompleted()) { - if ("已完成".equals( work.getWorkProcessStatus()) || work.getIsCompleted()) { - workReportStatisticEntity.setReportStatus("工作已完成"); - } else { - workReportStatisticEntity.setReportStatus("已提交汇报"); - } - // 将当前汇报作为最终汇报内容,获取汇报详细内容 - if ( okrWorkReportBaseInfo != null ) { - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get(okrWorkReportBaseInfo.getId()); - } catch (Exception e) { - logger.warn("system get okrWorkReportDetailInfo by id got an exception. " ); - logger.error(e); - } - // 查询汇报的所有处理记录，获取所有的领导审核意见 - try { - ids = okrWorkReportProcessLogService.listByReportId(okrWorkReportBaseInfo.getId()); - } catch (Exception e) { - logger.warn("system list workReportProcessLog ids by workReport id got an exception. " ); - logger.error(e); - } - try { - okrWorkReportProcessLogList = okrWorkReportProcessLogService.list(ids); - } catch (Exception e) { - logger.warn("system list workReportProcessLog by ids got an exception. " ); - logger.error(e); - } - } - - if ( okrWorkReportDetailInfo != null ) { - workReportStatisticEntity.setWorkPlan(okrWorkReportDetailInfo.getWorkPlan()); - workReportStatisticEntity.setProgressDescription(okrWorkReportDetailInfo.getProgressDescription()); - workReportStatisticEntity.setWorkPointAndRequirements(okrWorkReportDetailInfo.getWorkPointAndRequirements()); - workReportStatisticEntity.setAdminSuperviseInfo(okrWorkReportDetailInfo.getAdminSuperviseInfo()); - } - - if ( okrWorkReportProcessLogList != null && !okrWorkReportProcessLogList.isEmpty() ) { - // 组织所有的审核意见 - for (OkrWorkReportProcessLog okrWorkReportProcessLog : okrWorkReportProcessLogList) { - if ("领导批示".equals( okrWorkReportProcessLog.getActivityName()) && "正常".equals(okrWorkReportProcessLog.getStatus()) ) { - workReportProcessOpinionEntity = new WorkReportProcessOpinionEntity(); - workReportProcessOpinionEntity.setOpinion(okrWorkReportProcessLog.getOpinion()); - workReportProcessOpinionEntity.setProcessorTopUnitName(okrWorkReportProcessLog.getProcessorTopUnitName()); - workReportProcessOpinionEntity.setProcessorName(okrWorkReportProcessLog.getProcessorName()); - workReportProcessOpinionEntity.setProcessorUnitName(okrWorkReportProcessLog.getProcessorUnitName()); - workReportProcessOpinionEntity.setProcessTimeStr(okrWorkReportProcessLog.getProcessTimeStr()); - workReportProcessOpinionEntityList.add(workReportProcessOpinionEntity); - workReportStatisticEntity.setOpinions( workReportProcessOpinionEntityList ); - } - } - } - } - } else { - workReportStatisticEntity.setReportStatus("不需要汇报"); - } - return workReportStatisticEntity; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportStatusService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportStatusService.java deleted file mode 100644 index fe691a52d9..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteSt_WorkReportStatusService.java +++ /dev/null @@ -1,401 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.google.gson.Gson; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.SortTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.common.date.MonthOfYear; -import com.x.okr.assemble.common.date.WeekOfYear; -import com.x.okr.assemble.control.schedule.St_WorkReportStatus; -import com.x.okr.assemble.control.schedule.entity.WorkBaseReportSubmitEntity; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; - -public class ExcuteSt_WorkReportStatusService { - private static Logger logger = LoggerFactory.getLogger( St_WorkReportStatus.class ); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - private OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - private OkrWorkReportDetailInfoService okrWorkReportDetailInfoService = new OkrWorkReportDetailInfoService(); - private OkrStatisticReportStatusService okrStatisticReportStatusService = new OkrStatisticReportStatusService(); - private DateOperation dateOperation = new DateOperation(); - - public void execute() { - List ids = null; - String status = "All";//如果不需要在统计里展示 ，就应该为已归档 - try { - ids = okrWorkBaseInfoService.listAllDeployedWorkIds( null, status ); - } catch (Exception e) { - logger.warn("Timertask OKR_St_WorkReportStatus service list all no archive centerworks got an exception." ); - logger.error(e); - } - if (ids != null && !ids.isEmpty()) { - statisticWorksReportSubmit( ids ); - } - logger.info("Timertask OKR_St_WorkReportStatus completed and excute success."); - } - - public void executeAll() { - List ids = null; - try { - ids = okrWorkBaseInfoService.listAllDeployedWorkIds( null, null ); - } catch (Exception e) { - logger.warn("Timertask OKR_St_WorkReportStatus service list all no archive centerworks got an exception." ); - logger.error(e); - } - if (ids != null && !ids.isEmpty()) { - statisticWorksReportSubmit( ids ); - } - logger.info("Timertask OKR_St_WorkReportStatus completed and excute success."); - } - - /** - * 分析所有未归档的工作中所有工作的汇报情况 - * - * @param okrCenterWorkInfoList - * @return - */ - public void statisticWorksReportSubmit( List workIds ) { - String statisticContent = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - if ( workIds != null && !workIds.isEmpty() ) { - for ( String workId : workIds) { - System.out.println(""); - System.out.println("=================================================="); - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get( workId ); - if( okrWorkBaseInfo != null ){ - //logger.debug( "system getting report status statistic for work "+ i +"/"+total+" named:["+ okrWorkBaseInfo.getTitle() +"]......" ); - statisticContent = statisticWorkReports( okrWorkBaseInfo ); - } - //将获取到的统计数据存储到数据库中，如果数据已经存在，则进行统计数据更新 - saveStatisticContentToDB( okrWorkBaseInfo, statisticContent ); - } catch (Exception e) { - logger.warn("Timertask service list all processing works got an exception." ); - logger.error(e); - } - } - } - } - - private void saveStatisticContentToDB( OkrWorkBaseInfo okrWorkBaseInfo, String statisticContent ) throws Exception { - OkrStatisticReportStatus statistic = new OkrStatisticReportStatus(); - statistic.setCenterId( okrWorkBaseInfo.getCenterId() ); - statistic.setCenterTitle( okrWorkBaseInfo.getCenterTitle() ); - statistic.setReportStatistic( statisticContent ); - statistic.setResponsibilityEmployeeName( okrWorkBaseInfo.getResponsibilityEmployeeName() ); - statistic.setResponsibilityTopUnitName( okrWorkBaseInfo.getResponsibilityTopUnitName() ); - statistic.setResponsibilityIdentity( okrWorkBaseInfo.getResponsibilityIdentity() ); - statistic.setResponsibilityUnitName( okrWorkBaseInfo.getResponsibilityUnitName() ); - statistic.setWorkId( okrWorkBaseInfo.getId() ); - if( okrWorkBaseInfo.getParentWorkId() != null && !okrWorkBaseInfo.getParentWorkId().isEmpty() && okrWorkBaseInfo.getParentWorkId().trim().length() > 1 ){ - statistic.setParentId( okrWorkBaseInfo.getParentWorkId() ); - }else{ - statistic.setParentId( null ); - } - statistic.setWorkTitle( okrWorkBaseInfo.getTitle() ); - statistic.setWorkLevel( okrWorkBaseInfo.getWorkLevel() ); - statistic.setWorkType( okrWorkBaseInfo.getWorkType() ); - statistic.setWorkProcessStatus( okrWorkBaseInfo.getWorkProcessStatus() ); - statistic.setReportCycle( okrWorkBaseInfo.getReportCycle() ); - statistic.setReportDayInCycle( okrWorkBaseInfo.getReportDayInCycle() ); - statistic.setWorkDateTimeType( okrWorkBaseInfo.getWorkDateTimeType() ); - statistic.setStatisticYear( Integer.parseInt( dateOperation.getYear( new Date()) ) ); - statistic.setDeployDateStr( okrWorkBaseInfo.getDeployDateStr() ); - statistic.setCompleteDateLimitStr( okrWorkBaseInfo.getCompleteDateLimitStr() ); - okrStatisticReportStatusService.save( statistic ); - } - - /** - * 对单个工作,按部署日期 到工作完成时限期间的时间段，以及汇报方式进行汇报情况信息统计 - * @param okrWorkBaseInfo - * @throws Exception - */ - private String statisticWorkReports( OkrWorkBaseInfo okrWorkBaseInfo ) throws Exception { - List ids = null; - List allReportList = null; - List workBaseReportSubmitEntityList = new ArrayList<>(); - WorkBaseReportSubmitEntity workBaseReportSubmitEntity = null; - String statisticContent = null; - - try { - ids = okrWorkReportQueryService.listByWorkId( okrWorkBaseInfo.getId() ); - if( ids != null && !ids.isEmpty() ){ - allReportList = okrWorkReportQueryService.listByIds( ids ); - } - } catch (Exception e) { - logger.warn( "system list report info with work id got an exception.workId:" + okrWorkBaseInfo.getId() ); - throw e; - } - - if( "每月汇报".equals( okrWorkBaseInfo.getReportCycle() )){ - List monthOfYearList = null; - monthOfYearList = dateOperation.getMonthsOfYear( okrWorkBaseInfo.getDeployDateStr(), okrWorkBaseInfo.getCompleteDateLimitStr() ); - if( monthOfYearList != null && !monthOfYearList.isEmpty() ){ - if( "长期工作".equals( okrWorkBaseInfo.getWorkDateTimeType() )){ - for( MonthOfYear monthOfYear : monthOfYearList ){ - try { - workBaseReportSubmitEntity = getMonthReportSubmitEntity( okrWorkBaseInfo, allReportList, monthOfYear ); - workBaseReportSubmitEntityList.add( workBaseReportSubmitEntity ); - } catch (Exception e) { - logger.warn( "system get week report submit enitty got an exception." ); - logger.error(e); - } - } - }else{ - //如果是短期工作,根本不需要进行汇报,所以不进行汇报情况统计 - for( MonthOfYear monthOfYear : monthOfYearList ){ - workBaseReportSubmitEntity = new WorkBaseReportSubmitEntity(); - workBaseReportSubmitEntity.setCycleNumber( monthOfYear.getMonth() ); - workBaseReportSubmitEntity.setStartDate( monthOfYear.getStartDateString() ); - workBaseReportSubmitEntity.setEndDate( monthOfYear.getEndDateString() ); - workBaseReportSubmitEntity.setCycleType( "每月汇报" ); - workBaseReportSubmitEntity.setReportStatus( -1 ); //无须汇报 - workBaseReportSubmitEntity.setSubmitTime( null ); - workBaseReportSubmitEntity.setDescription( "该工作为短期工作,无须汇报" ); - workBaseReportSubmitEntityList.add( workBaseReportSubmitEntity ); - } - } - } - }else if( "每周汇报".equals( okrWorkBaseInfo.getReportCycle() )){ - List weekOfYearList = null; - weekOfYearList = dateOperation.getWeeksOfYear( okrWorkBaseInfo.getDeployDateStr(), okrWorkBaseInfo.getCompleteDateLimitStr() ); - if( weekOfYearList != null && !weekOfYearList.isEmpty() ){ - if( "长期工作".equals( okrWorkBaseInfo.getWorkDateTimeType() )){ - for( WeekOfYear weekOfYear : weekOfYearList ){ - try { - workBaseReportSubmitEntity = getWeekReportSubmitEntity( okrWorkBaseInfo, allReportList, weekOfYear ); - workBaseReportSubmitEntityList.add( workBaseReportSubmitEntity ); - } catch (Exception e) { - logger.warn( "system get week report submit enitty got an exception." ); - logger.error(e); - } - } - }else{ - //如果是短期工作,根本不需要进行汇报,所以不进行汇报情况统计 - for( WeekOfYear weekOfYear : weekOfYearList ){ - workBaseReportSubmitEntity = new WorkBaseReportSubmitEntity(); - workBaseReportSubmitEntity.setCycleNumber( weekOfYear.getWeekNo() ); - workBaseReportSubmitEntity.setStartDate( weekOfYear.getStartDateString() ); - workBaseReportSubmitEntity.setEndDate( weekOfYear.getEndDateString() ); - workBaseReportSubmitEntity.setCycleType( "每周汇报" ); - workBaseReportSubmitEntity.setReportStatus( -1 ); //无须汇报 - workBaseReportSubmitEntity.setSubmitTime( null ); - workBaseReportSubmitEntity.setDescription( "该工作为短期工作,无须汇报" ); - workBaseReportSubmitEntityList.add( workBaseReportSubmitEntity ); - } - } - } - }else{//不需要汇报 - workBaseReportSubmitEntity = new WorkBaseReportSubmitEntity(); - workBaseReportSubmitEntity.setCycleType( okrWorkBaseInfo.getReportCycle() ); - workBaseReportSubmitEntity.setReportStatus( -1 ); //无须汇报 - workBaseReportSubmitEntity.setSubmitTime( null ); - workBaseReportSubmitEntity.setDescription( okrWorkBaseInfo.getReportCycle() + "暂无汇报" ); - workBaseReportSubmitEntityList.add( workBaseReportSubmitEntity ); - } - - //组织好了workBaseReportSubmitEntityList， 也许为空 - Gson gson = XGsonBuilder.instance(); - if( workBaseReportSubmitEntityList != null && !workBaseReportSubmitEntityList.isEmpty() ){ - statisticContent = gson.toJson( workBaseReportSubmitEntityList ); - }else{ - statisticContent = "{}"; - } - return statisticContent; - } - - private WorkBaseReportSubmitEntity getMonthReportSubmitEntity( OkrWorkBaseInfo okrWorkBaseInfo, List allReportList, MonthOfYear monthOfYear ) throws Exception { - List reportBaseList = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - WorkBaseReportSubmitEntity workBaseReportSubmitEntity = null; - - workBaseReportSubmitEntity = new WorkBaseReportSubmitEntity(); - workBaseReportSubmitEntity.setCycleNumber( monthOfYear.getMonth() ); - workBaseReportSubmitEntity.setCycleType( "每月汇报" ); - workBaseReportSubmitEntity.setStartDate( monthOfYear.getStartDateString() ); - workBaseReportSubmitEntity.setEndDate( monthOfYear.getEndDateString() ); - - if( okrWorkBaseInfo.getIsCompleted() || okrWorkBaseInfo.getOverallProgress() == 100 ){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "该工作已经完成" ); - }else{ - //查询该工作在该时间区间内所有的工作汇报ID - reportBaseList = getReportInTimeQuarter( allReportList, monthOfYear.getStartDate(), monthOfYear.getEndDate() ); - if( reportBaseList != null && !reportBaseList.isEmpty() ){ - //遍历每一个工作信息,看看是否提交和是否填写汇报信息 - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : reportBaseList ){ - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get( okrWorkReportBaseInfo.getId() ); - } catch (Exception e) { - logger.warn( "system query report detail with report id got an exception.id:" + okrWorkReportBaseInfo.getId() ); - throw e; - } - if( okrWorkReportBaseInfo.getSubmitTime() != null ){//已提交汇报信息 - workBaseReportSubmitEntity.setSubmitTime( okrWorkReportBaseInfo.getSubmitTime() ); - workBaseReportSubmitEntity.setReportId( okrWorkReportBaseInfo.getId() ); - if( okrWorkReportDetailInfo != null && okrWorkReportDetailInfo.getProgressDescription() != null && !okrWorkReportDetailInfo.getProgressDescription().isEmpty() ){ - workBaseReportSubmitEntity.setReportStatus( 1 ); //有汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报已提交，有汇报内容" ); - break; - }else{ - workBaseReportSubmitEntity.setReportStatus( 0 ); //无汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报已提交，无汇报内容" ); - } - }else{ - workBaseReportSubmitEntity.setSubmitTime( null ); - if( okrWorkReportDetailInfo != null && okrWorkReportDetailInfo.getProgressDescription() != null && !okrWorkReportDetailInfo.getProgressDescription().isEmpty() ){ - workBaseReportSubmitEntity.setReportStatus( 1 ); //有汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报未提交，有汇报内容" ); - break; - }else{ - if( okrWorkBaseInfo.getArchiveDate() != null && okrWorkBaseInfo.getArchiveDate().before( monthOfYear.getStartDate() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "工作已经归档，不需要汇报" ); - }else{ - workBaseReportSubmitEntity.setReportStatus( 0 ); //无汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报未提交，无汇报内容" ); - } - } - } - } - }else{ - if( okrWorkBaseInfo.getArchiveDate() != null && okrWorkBaseInfo.getArchiveDate().before( monthOfYear.getStartDate() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "工作已经归档，不需要汇报" ); - }else{ - workBaseReportSubmitEntity.setReportStatus( 0 ); //无汇报内容 - workBaseReportSubmitEntity.setDescription( "该工作暂无汇报信息" ); - } - } - } - - logger.info( "工作："+ okrWorkBaseInfo.getTitle() +", 月汇报情况("+ workBaseReportSubmitEntity.getCycleType() + "-" + workBaseReportSubmitEntity.getCycleNumber() +")：" + workBaseReportSubmitEntity.getReportStatus() + ", 说明：" + workBaseReportSubmitEntity.getDescription() ); - return workBaseReportSubmitEntity; - } - - private WorkBaseReportSubmitEntity getWeekReportSubmitEntity( OkrWorkBaseInfo okrWorkBaseInfo, List allReportList, WeekOfYear weekOfYear ) throws Exception { - List reportBaseList = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - WorkBaseReportSubmitEntity workBaseReportSubmitEntity = null; - - workBaseReportSubmitEntity = new WorkBaseReportSubmitEntity(); - workBaseReportSubmitEntity.setCycleNumber( weekOfYear.getWeekNo() ); - workBaseReportSubmitEntity.setCycleType( "每周汇报" ); - workBaseReportSubmitEntity.setStartDate( weekOfYear.getStartDateString() ); - workBaseReportSubmitEntity.setEndDate( weekOfYear.getEndDateString() ); - - //查询该工作在该时间区间内所有的工作汇报ID - reportBaseList = getReportInTimeQuarter( allReportList, weekOfYear.getStartDate(), weekOfYear.getEndDate() ); - - if( reportBaseList != null && !reportBaseList.isEmpty() ){ - //遍历每一个工作汇报信息,看看是否提交和是否填写汇报信息 - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : reportBaseList ){ - try { - okrWorkReportDetailInfo = okrWorkReportDetailInfoService.get( okrWorkReportBaseInfo.getId() ); - } catch (Exception e) { - logger.warn( "system query report detail with report id got an exception.id:" + okrWorkReportBaseInfo.getId() ); - throw e; - } - if( okrWorkReportBaseInfo.getSubmitTime() != null ){//已提交汇报信息 - workBaseReportSubmitEntity.setSubmitTime( okrWorkReportBaseInfo.getSubmitTime() ); - workBaseReportSubmitEntity.setReportId( okrWorkReportBaseInfo.getId() ); - if( okrWorkReportDetailInfo != null && okrWorkReportDetailInfo.getProgressDescription() != null && !okrWorkReportDetailInfo.getProgressDescription().isEmpty() ){ - workBaseReportSubmitEntity.setReportStatus( 1 ); //有汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报已提交，有汇报内容" ); - break; - }else{ - if( okrWorkBaseInfo.getIsCompleted() || okrWorkBaseInfo.getOverallProgress() == 100 ){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "该工作已经完成" ); - }else if( weekOfYear.getStartDate().after( new Date() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "汇报日期未到，不需要汇报" ); - }else{ - workBaseReportSubmitEntity.setReportStatus( 0 ); //无汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报已提交，无汇报内容" ); - } - } - }else{ - workBaseReportSubmitEntity.setSubmitTime( null ); - if( okrWorkReportDetailInfo != null && okrWorkReportDetailInfo.getProgressDescription() != null && !okrWorkReportDetailInfo.getProgressDescription().isEmpty() ){ - workBaseReportSubmitEntity.setReportStatus( 1 ); //有汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报未提交，有汇报内容" ); - break; - }else{ - if( okrWorkBaseInfo.getIsCompleted() || okrWorkBaseInfo.getOverallProgress() == 100 ){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "该工作已经完成" ); - }else{ - //在这个时候，工作已经归档过了，所以不需要汇报 - if( okrWorkBaseInfo.getArchiveDate() != null && okrWorkBaseInfo.getArchiveDate().before( weekOfYear.getStartDate() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "工作已经归档，不需要汇报" ); - }else if( weekOfYear.getStartDate().after( new Date() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "汇报日期未到，不需要汇报" ); - }else{ - workBaseReportSubmitEntity.setReportStatus( 0 ); //无汇报内容 - workBaseReportSubmitEntity.setDescription( "汇报未提交，无汇报内容" ); - } - } - } - } - } - }else{ - if( okrWorkBaseInfo.getIsCompleted() || okrWorkBaseInfo.getOverallProgress() == 100 ){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "该工作已经完成" ); - }else{ - if( okrWorkBaseInfo.getArchiveDate() != null && okrWorkBaseInfo.getArchiveDate().before( weekOfYear.getStartDate() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "工作已经归档，不需要汇报" ); - }else if( weekOfYear.getStartDate().after( new Date() )){ - workBaseReportSubmitEntity.setReportStatus( -1 ); - workBaseReportSubmitEntity.setDescription( "汇报日期未到，不需要汇报" ); - }else{ - workBaseReportSubmitEntity.setReportStatus( 0 ); //无汇报内容 - workBaseReportSubmitEntity.setDescription( "该工作暂无汇报信息" ); - } - } - } - - return workBaseReportSubmitEntity; - } - - /** - * 根据工作ID,以及开始和结束时间来查询这一时间段内所有的工作汇报信息列表 - * @param workId - * @param startDate - * @param endDate - * @return - * @throws Exception - */ - private List getReportInTimeQuarter( List allReportList, Date startDate, Date endDate ) throws Exception { - List reportList = new ArrayList<>(); - Boolean check = false; - if( allReportList != null && !allReportList.isEmpty() ){ - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : allReportList ){ - check = ( okrWorkReportBaseInfo.getCreateTime().after( startDate ) && okrWorkReportBaseInfo.getCreateTime().before( endDate ) ); - if( check ){ - //是需要的时间区间内的汇报 - reportList.add( okrWorkReportBaseInfo ); - } - } - } - try { - SortTools.desc( reportList, "createTime" ); - } catch (Exception e) { - logger.warn( "system sort report list got an exception." ); - throw e; - } - return reportList; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteWorkReportCreateService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteWorkReportCreateService.java deleted file mode 100644 index c05b5a64c2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/ExcuteWorkReportCreateService.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.dataadapter.webservice.sms.SmsMessageOperator; -import com.x.okr.assemble.control.jaxrs.queue.WrapInWorkDynamic; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class ExcuteWorkReportCreateService { - - private static Logger logger = LoggerFactory.getLogger( ExcuteWorkReportCreateService.class ); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - private OkrWorkReportOperationService okrWorkReportBaseInfoService = new OkrWorkReportOperationService(); - private OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - - public void execute(){ - String config_report_autocreate = "CLOSE"; - String report_auto_over = "CLOSE"; - Boolean check = true; - - // 判断系统是否已经启用了，REPORT_AUTOCREATE - try { - config_report_autocreate = okrConfigSystemService.getValueWithConfigCode("REPORT_AUTOCREATE"); - } catch (Exception e) { - config_report_autocreate = "CLOSE"; - check = false; - logger.warn("system get system config 'REPORT_SUPERVISOR' got an exception" ); - logger.error(e); - } - - if (check) { - if ("OPEN".equalsIgnoreCase(config_report_autocreate.toUpperCase())) { - List ids = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - check = true; - try { - ids = okrWorkBaseInfoService.listNeedReportWorkIds(); - } catch (Exception e) { - logger.warn("system list work ids what needs report new got an exception." ); - logger.error(e); - } - if ( ListTools.isNotEmpty( ids ) ) { - for (String id : ids) { - check = true; - if (check) { - try { - okrWorkBaseInfo = okrWorkBaseInfoService.get(id); - } catch (Exception e) { - check = false; - logger.warn("system get work{'id':'" + id + "'} got an exception."); - logger.error(e); - } - } - if( check ){ - try { - report_auto_over = okrConfigSystemService.getValueWithConfigCode( "REPORT_AUTO_OVER" ); - } catch (Exception e) { - report_auto_over = "CLOSE"; - logger.warn( "system get system config 'REPORT_AUTO_OVER' got an exception" ); - logger.error(e); - - } - } - if (check && okrWorkBaseInfo != null && okrWorkBaseInfo.getNextReportTime() !=null ) { - try { - logger.info( "system is creating report draft for work{'id':'"+id+"','title':'"+okrWorkBaseInfo.getTitle()+"'}......"); - /** - * 根据基础的信息，生成工作汇报的草稿信息，并且向责任者推送待办信息 - */ - okrWorkReportBaseInfo = okrWorkReportBaseInfoService.createReportDraft( okrWorkBaseInfo, report_auto_over ); - if (okrWorkReportBaseInfo != null) { - WrapInWorkDynamic.sendWithWorkReport( okrWorkReportBaseInfo, - "SYSTEM", - "SYSTEM", - "SYSTEM" , - "创建工作汇报", - "工作汇报创建成功！" - ); - SmsMessageOperator.sendWithPersonName(okrWorkBaseInfo.getResponsibilityEmployeeName(), "您的工作'"+okrWorkReportBaseInfo.getTitle()+"'定期汇报已经生成，请及时填写！"); - } - } catch (Exception e) { - logger.warn("system create report draft for work{'id':'" + id + "'} got an exception." ); - logger.error(e); - } - } else { - logger.warn("work{'id':'" + id + "'} not exists."); - } - } - } - logger.info("Timertask_OKR_WorkReportCreate completed and excute success."); - } - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrAttachmentFileInfoService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrAttachmentFileInfoService.java deleted file mode 100644 index 46f86bb8c2..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrAttachmentFileInfoService.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrAttachmentFileInfo; - -/** - * 类 名：OkrAttachmentFileInfoService
- * 实体类：OkrAttachmentFileInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrAttachmentFileInfoService{ - - private static Logger logger = LoggerFactory.getLogger( OkrAttachmentFileInfoService.class ); - - /** - * 根据传入的ID从数据库查询OkrAttachmentFileInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrAttachmentFileInfo get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrAttachmentFileInfo.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据传入的ID从数据库查询OkrAttachmentFileInfo对象 - * @param id - * @return - * @throws Exception - */ - public List list( List ids ) throws Exception { - if( ids == null || ids.isEmpty() ){ - return null; - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrAttachmentFileInfoFactory().list(ids); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrAttachmentFileInfo对象 - * @param wrapIn - */ - public OkrAttachmentFileInfo save( OkrAttachmentFileInfo wrapIn ) throws Exception { - OkrAttachmentFileInfo okrAttachmentFileInfo = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrAttachmentFileInfo = emc.find( wrapIn.getId(), OkrAttachmentFileInfo.class ); - if( okrAttachmentFileInfo != null ){ - emc.beginTransaction( OkrAttachmentFileInfo.class ); - wrapIn.copyTo( okrAttachmentFileInfo, JpaObject.FieldsUnmodify ); - emc.check( okrAttachmentFileInfo, CheckPersistType.all ); - emc.commit(); - }else{ - okrAttachmentFileInfo = new OkrAttachmentFileInfo(); - emc.beginTransaction( OkrAttachmentFileInfo.class ); - wrapIn.copyTo( okrAttachmentFileInfo ); - okrAttachmentFileInfo.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrAttachmentFileInfo, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrAttachmentFileInfo update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrAttachmentFileInfo = new OkrAttachmentFileInfo(); - emc.beginTransaction( OkrAttachmentFileInfo.class ); - wrapIn.copyTo( okrAttachmentFileInfo ); - emc.persist( okrAttachmentFileInfo, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrAttachmentFileInfo create got a error!", e); - throw e; - } - } - return okrAttachmentFileInfo; - } - - /** - * 根据ID从数据库中删除OkrAttachmentFileInfo对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrAttachmentFileInfo okrAttachmentFileInfo = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrAttachmentFileInfo = emc.find(id, OkrAttachmentFileInfo.class); - if ( null == okrAttachmentFileInfo ) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.remove( okrAttachmentFileInfo, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteArchive.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteArchive.java deleted file mode 100644 index f4da349b41..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteArchive.java +++ /dev/null @@ -1,314 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDetailInfo; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class OkrCenterWorkExcuteArchive { - private OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - /** - * 根据ID从归档OkrCenterWorkInfo对象 - * 同时归档所有的下级工作以及工作的相关汇报，请示等等 - * 并且删除所有待办 - * @param id - * @throws Exception - */ - public void archive( EntityManagerContainer emc, String centerId ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not archive any object." ); - } - List ids = null; - List statisticIds = null; - List del_attachmentIds = new ArrayList(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrAttachmentFileInfo attachment = null; - StorageMapping mapping = null; - List okrWorkBaseInfoList = null; - List okrWorkDetailInfoList = null; - List okrWorkPersonList = null; - List okrWorkReportBaseInfoList = null; - List okrWorkReportDetailInfoList = null; - List okrWorkReportPersonLinkList = null; - List okrWorkReportProcessLogList = null; - List okrWorkDynamicsList = null; - List okrWorkAuthorizeRecordList = null; - List okrTaskList = null; - OkrStatisticReportContent okrStatisticReportContent = null; - OkrStatisticReportStatus okrStatisticReportStatus = null; - Business business = new Business(emc); - okrCenterWorkInfo = emc.find( centerId, OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class ); - emc.beginTransaction( OkrWorkDetailInfo.class ); - emc.beginTransaction( OkrWorkPerson.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - emc.beginTransaction( OkrWorkChat.class ); - emc.beginTransaction( OkrWorkDynamics.class ); - emc.beginTransaction( OkrWorkAuthorizeRecord.class ); - emc.beginTransaction( OkrStatisticReportContent.class ); - emc.beginTransaction( OkrStatisticReportStatus.class ); - - if ( null != okrCenterWorkInfo ) { - if( "草稿".equals( okrCenterWorkInfo.getProcessStatus() )){ - if( okrCenterWorkInfo.getAttachmentList() != null && !okrCenterWorkInfo.getAttachmentList().isEmpty() ){ - for( String id : okrCenterWorkInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrCenterWorkInfo, CheckRemoveType.all ); - }else{ - okrCenterWorkInfo.setStatus( "已归档" ); - emc.check( okrCenterWorkInfo, CheckPersistType.all ); - } - } - ids = business.okrWorkReportPersonLinkFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list(ids); - for( OkrWorkReportPersonLink okrWorkReportPersonLink : okrWorkReportPersonLinkList ){ - if( okrWorkReportPersonLink != null ){ - if( "草稿".equals( okrWorkReportPersonLink.getProcessStatus() )){ - emc.remove( okrWorkReportPersonLink, CheckRemoveType.all ); - }else{ - okrWorkReportPersonLink.setStatus( "已归档" ); - emc.check( okrWorkReportPersonLink, CheckPersistType.all ); - } - } - } - } - ids = business.okrWorkReportBaseInfoFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportBaseInfoList = business.okrWorkReportBaseInfoFactory().list(ids); - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : okrWorkReportBaseInfoList ){ - if( okrWorkReportBaseInfo != null ){ - if( "草稿".equals( okrWorkReportBaseInfo.getProcessStatus() )){ - if( okrWorkReportBaseInfo.getAttachmentList() != null && !okrWorkReportBaseInfo.getAttachmentList().isEmpty() ){ - for( String id : okrWorkReportBaseInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrWorkReportBaseInfo, CheckRemoveType.all ); - }else{ - okrWorkReportBaseInfo.setStatus( "已归档" ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - } - } - } - } - ids = business.okrWorkBaseInfoFactory().listByCenterWorkId( centerId, null ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkBaseInfoList = business.okrWorkBaseInfoFactory().list(ids); - for( OkrWorkBaseInfo okrWorkBaseInfo : okrWorkBaseInfoList ){ - if( okrWorkBaseInfo != null ){ - if( "草稿".equals( okrWorkBaseInfo.getWorkProcessStatus() )){ - if( okrWorkBaseInfo.getAttachmentList() != null && !okrWorkBaseInfo.getAttachmentList().isEmpty() ){ - for( String id : okrWorkBaseInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrWorkBaseInfo, CheckRemoveType.all ); - }else{ - okrWorkBaseInfo.setStatus( "已归档" ); - okrWorkBaseInfo.setArchiveDate( new Date() ); - emc.check( okrWorkBaseInfo, CheckPersistType.all ); - } - } - } - } - //归档统计数据 - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - statisticIds = business.okrStatisticReportContentFactory().list( id, null, null, null, null ); - if (statisticIds != null && statisticIds.size() > 0) { - for ( String statisticId : statisticIds) { - okrStatisticReportContent = emc.find( statisticId, OkrStatisticReportContent.class); - if ( okrStatisticReportContent != null) { - okrStatisticReportContent.setStatus("已归档"); - emc.check( okrStatisticReportContent, CheckPersistType.all); - } - } - } - statisticIds = business.okrStatisticReportStatusFactory().listIds(null, id, null, null, null ); - if (statisticIds != null && statisticIds.size() > 0) { - for ( String statisticId : statisticIds) { - okrStatisticReportStatus = emc.find( statisticId, OkrStatisticReportStatus.class); - if ( okrStatisticReportStatus != null) { - okrStatisticReportStatus.setStatus("已归档"); - emc.check( okrStatisticReportStatus, CheckPersistType.all); - } - } - } - } - } - ids = business.okrWorkReportProcessLogFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportProcessLogList = business.okrWorkReportProcessLogFactory().list(ids); - for( OkrWorkReportProcessLog okrWorkReportProcessLog : okrWorkReportProcessLogList ){ - if( okrWorkReportProcessLog != null ){ - okrWorkReportProcessLog.setStatus( "已归档" ); - emc.check( okrWorkReportProcessLog, CheckPersistType.all ); - } - } - } - ids = business.okrWorkReportDetailInfoFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportDetailInfoList = business.okrWorkReportDetailInfoFactory().list(ids); - for( OkrWorkReportDetailInfo okrWorkReportDetailInfo : okrWorkReportDetailInfoList ){ - if( okrWorkReportDetailInfo != null ){ - okrWorkReportDetailInfo.setStatus( "已归档" ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - } - } - } - ids = business.okrWorkPersonFactory().listByCenterWorkId( centerId, null ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkPersonList = business.okrWorkPersonFactory().list(ids); - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - if( okrWorkPerson != null ){ - okrWorkPerson.setStatus( "已归档" ); - emc.check( okrWorkPerson, CheckPersistType.all ); - } - } - } - ids = business.okrWorkDetailInfoFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkDetailInfoList = business.okrWorkDetailInfoFactory().list(ids); - for( OkrWorkDetailInfo okrWorkDetailInfo : okrWorkDetailInfoList ){ - if( okrWorkDetailInfo != null ){ - okrWorkDetailInfo.setStatus( "已归档" ); - emc.check( okrWorkDetailInfo, CheckPersistType.all ); - } - } - } - ids = business.okrWorkAuthorizeRecordFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkAuthorizeRecordList = business.okrWorkAuthorizeRecordFactory().list(ids); - for( OkrWorkAuthorizeRecord okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - if( okrWorkAuthorizeRecord != null ){ - okrWorkAuthorizeRecord.setStatus( "已归档" ); - emc.check( okrWorkAuthorizeRecord, CheckPersistType.all ); - } - } - } - ids = business.okrWorkDynamicsFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkDynamicsList = business.okrWorkDynamicsFactory().list(ids); - for( OkrWorkDynamics okrWorkDynamics : okrWorkDynamicsList ){ - if( okrWorkDynamics != null ){ - okrWorkDynamics.setStatus( "已归档" ); - emc.check( okrWorkDynamics, CheckPersistType.all ); - } - } - } - ids = business.okrTaskFactory().listByCenterWorkId( centerId ); - List taskIdentityInfoList = new ArrayList<>(); - if( ListTools.isNotEmpty( ids ) ){ - okrTaskList = business.okrTaskFactory().list(ids); - for( OkrTask okrTask : okrTaskList ){ - if( okrTask != null ){ - emc.remove( okrTask, CheckRemoveType.all ); - if ("工作汇报".equals(okrTask.getDynamicObjectType())) { - taskIdentityInfoList = putTaskIdentityInfoToList( okrTask.getTargetIdentity(), okrTask.getWorkType(), taskIdentityInfoList ); - } - } - } - } - if( del_attachmentIds != null && !del_attachmentIds.isEmpty() ){ - for( String id : del_attachmentIds ){ - attachment = emc.find( id, OkrAttachmentFileInfo.class ); - if( attachment != null ){ - mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage() ); - attachment.deleteContent( mapping ); - emc.remove( attachment, CheckRemoveType.all ); - } - } - } - emc.commit(); - - if( ListTools.isNotEmpty( taskIdentityInfoList )) { - for( TaskIdentityInfo _taskIdentityInfo : taskIdentityInfoList ) { - try { - okrWorkReportTaskCollectService.checkReportCollectTask(_taskIdentityInfo.getIdentity(), _taskIdentityInfo.getWorkTypeList()); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - - private List putTaskIdentityInfoToList(String targetIdentity, String workType, List taskIdentityInfoList) { - if( taskIdentityInfoList == null ) { - taskIdentityInfoList = new ArrayList<>(); - } - Boolean exists = false; - for( TaskIdentityInfo taskIdentityInfo : taskIdentityInfoList ) { - if( taskIdentityInfo.getIdentity().equals( targetIdentity )) { - exists = true; - if( taskIdentityInfo.getWorkTypeList() == null ) { - taskIdentityInfo.setWorkTypeList( new ArrayList<>()); - } - if( !taskIdentityInfo.getWorkTypeList().contains( workType )) { - taskIdentityInfo.getWorkTypeList().add( workType ); - } - } - } - if( !exists ) { - List _workTypeList = new ArrayList<>(); - _workTypeList.add( workType ); - TaskIdentityInfo _taskIdentityInfo = new TaskIdentityInfo(targetIdentity, _workTypeList); - taskIdentityInfoList.add( _taskIdentityInfo ); - } - return taskIdentityInfoList; - } - - public class TaskIdentityInfo{ - private String identity = null; - private List workTypeList = null; - public String getIdentity() { - return identity; - } - public List getWorkTypeList() { - return workTypeList; - } - public void setIdentity(String identity) { - this.identity = identity; - } - public void setWorkTypeList(List workTypeList) { - this.workTypeList = workTypeList; - } - public TaskIdentityInfo(String identity, List workTypeList) { - super(); - this.identity = identity; - this.workTypeList = workTypeList; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDelete.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDelete.java deleted file mode 100644 index 9c4ff90c5a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDelete.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDetailInfo; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class OkrCenterWorkExcuteDelete { - - private OkrStatisticReportStatusService okrStatisticReportStatusService = new OkrStatisticReportStatusService(); - - /** - * 根据ID从数据库中删除OkrCenterWorkInfo对象 - * 同时删除所有的下级工作以及工作的相关汇报，请示等等 - * @param id - * @throws Exception - */ - public void delete( EntityManagerContainer emc, String centerId ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not delete any object." ); - } - List ids = null; - List statisticIds = null; - List del_attachmentIds = new ArrayList(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrAttachmentFileInfo attachment = null; - StorageMapping mapping = null; - List okrWorkBaseInfoList = null; - List okrWorkDetailInfoList = null; - List okrWorkPersonList = null; - List okrWorkReportBaseInfoList = null; - List okrWorkReportDetailInfoList = null; - List okrWorkReportPersonLinkList = null; - List okrWorkReportProcessLogList = null; - List okrWorkDynamicsList = null; - List okrWorkAuthorizeRecordList = null; - List okrTaskHandledList = null; - List okrTaskList = null; - List okrWorkChatList = null; - List statisticList = null; - OkrStatisticReportContent okrStatisticReportContent = null; - Business business = new Business(emc); - okrCenterWorkInfo = emc.find( centerId, OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class ); - emc.beginTransaction( OkrWorkDetailInfo.class ); - emc.beginTransaction( OkrWorkPerson.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - emc.beginTransaction( OkrWorkChat.class ); - emc.beginTransaction( OkrWorkDynamics.class ); - emc.beginTransaction( OkrWorkAuthorizeRecord.class ); - emc.beginTransaction( OkrStatisticReportContent.class ); - emc.beginTransaction( OkrStatisticReportStatus.class ); - - if ( null != okrCenterWorkInfo ) { - if( okrCenterWorkInfo.getAttachmentList() != null && !okrCenterWorkInfo.getAttachmentList().isEmpty() ){ - for( String id : okrCenterWorkInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrCenterWorkInfo, CheckRemoveType.all ); - } - - //删除所有与中心工作有关的待办信息，已办信息 - ids = business.okrTaskFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrTaskList = business.okrTaskFactory().list(ids); - for( OkrTask okrTask : okrTaskList ){ - if( okrTask != null ){ - emc.remove( okrTask, CheckRemoveType.all ); - } - } - } - ids = business.okrTaskHandledFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrTaskHandledList = business.okrTaskHandledFactory().list(ids); - for( OkrTaskHandled okrTaskHandled : okrTaskHandledList ){ - if( okrTaskHandled != null ){ - emc.remove( okrTaskHandled, CheckRemoveType.all ); - } - } - } - //删除所有与中心工作有关的工作汇报信息 - ids = business.okrWorkReportProcessLogFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportProcessLogList = business.okrWorkReportProcessLogFactory().list(ids); - for( OkrWorkReportProcessLog okrWorkReportProcessLog : okrWorkReportProcessLogList ){ - if( okrWorkReportProcessLog != null ){ - emc.remove( okrWorkReportProcessLog, CheckRemoveType.all ); - } - } - } - ids = business.okrWorkReportPersonLinkFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list(ids); - for( OkrWorkReportPersonLink okrWorkReportPersonLink : okrWorkReportPersonLinkList ){ - if( okrWorkReportPersonLink != null ){ - emc.remove( okrWorkReportPersonLink, CheckRemoveType.all ); - } - } - } - ids = business.okrWorkReportDetailInfoFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportDetailInfoList = business.okrWorkReportDetailInfoFactory().list(ids); - for( OkrWorkReportDetailInfo okrWorkReportDetailInfo : okrWorkReportDetailInfoList ){ - if( okrWorkReportDetailInfo != null ){ - emc.remove( okrWorkReportDetailInfo, CheckRemoveType.all ); - } - } - } - ids = business.okrWorkReportBaseInfoFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportBaseInfoList = business.okrWorkReportBaseInfoFactory().list(ids); - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : okrWorkReportBaseInfoList ){ - if( okrWorkReportBaseInfo != null ){ - if( okrWorkReportBaseInfo.getAttachmentList() != null && !okrWorkReportBaseInfo.getAttachmentList().isEmpty() ){ - for( String id : okrWorkReportBaseInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrWorkReportBaseInfo, CheckRemoveType.all ); - } - } - } - //删除所有与中心工作有关的工作信息 - ids = business.okrWorkPersonFactory().listByCenterWorkId( centerId, null ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkPersonList = business.okrWorkPersonFactory().list(ids); - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - if( okrWorkPerson != null ){ - emc.remove( okrWorkPerson, CheckRemoveType.all ); - } - } - } - ids = business.okrWorkDetailInfoFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkDetailInfoList = business.okrWorkDetailInfoFactory().list(ids); - for( OkrWorkDetailInfo okrWorkDetailInfo : okrWorkDetailInfoList ){ - if( okrWorkDetailInfo != null ){ - emc.remove( okrWorkDetailInfo, CheckRemoveType.all ); - } - } - } - ids = business.okrWorkBaseInfoFactory().listByCenterWorkId( centerId, null ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkBaseInfoList = business.okrWorkBaseInfoFactory().list(ids); - for( OkrWorkBaseInfo okrWorkBaseInfo : okrWorkBaseInfoList ){ - if( okrWorkBaseInfo != null ){ - if( okrWorkBaseInfo.getAttachmentList() != null && !okrWorkBaseInfo.getAttachmentList().isEmpty() ){ - for( String id : okrWorkBaseInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrWorkBaseInfo, CheckRemoveType.all ); - } - } - } - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - - statisticIds = business.okrStatisticReportContentFactory().list( id, null, null, null, null ); - if (statisticIds != null && statisticIds.size() > 0) { - for ( String statisticId : statisticIds) { - okrStatisticReportContent = emc.find( statisticId, OkrStatisticReportContent.class); - if ( okrStatisticReportContent != null) { - emc.remove( okrStatisticReportContent, CheckRemoveType.all); - } - } - } - - statisticList = okrStatisticReportStatusService.list( null, null, id, null, null, null, null ); - if( statisticList != null && !statisticList.isEmpty() ){ - for( OkrStatisticReportStatus okrStatisticReportStatus : statisticList ){ - emc.remove( okrStatisticReportStatus, CheckRemoveType.all); - } - } - } - } - - //删除所有与中心工作有关的工作授权记录 - ids = business.okrWorkAuthorizeRecordFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkAuthorizeRecordList = business.okrWorkAuthorizeRecordFactory().list(ids); - for( OkrWorkAuthorizeRecord okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - if( okrWorkAuthorizeRecord != null ){ - emc.remove( okrWorkAuthorizeRecord, CheckRemoveType.all ); - } - } - } - //删除所有与中心工作有关的工作动态信息 - ids = business.okrWorkDynamicsFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkDynamicsList = business.okrWorkDynamicsFactory().list(ids); - for( OkrWorkDynamics okrWorkDynamics : okrWorkDynamicsList ){ - if( okrWorkDynamics != null ){ - emc.remove( okrWorkDynamics, CheckRemoveType.all ); - } - } - } - //删除所有与中心工作有关的工作交流信息 - ids = business.okrWorkChatFactory().listByCenterWorkId( centerId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkChatList = business.okrWorkChatFactory().list(ids); - for( OkrWorkChat okrWorkChat : okrWorkChatList ){ - if( okrWorkChat != null ){ - emc.remove( okrWorkChat, CheckRemoveType.all ); - } - } - } - - if( del_attachmentIds != null && !del_attachmentIds.isEmpty() ){ - for( String id : del_attachmentIds ){ - attachment = emc.find( id, OkrAttachmentFileInfo.class ); - if( attachment != null ){ - mapping = ThisApplication.context().storageMappings().get( OkrAttachmentFileInfo.class, attachment.getStorage() ); - attachment.deleteContent( mapping ); - emc.remove( attachment, CheckRemoveType.all ); - } - } - } - emc.commit(); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDeploy.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDeploy.java deleted file mode 100644 index 7f5fad0798..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteDeploy.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.x.okr.assemble.control.service; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class OkrCenterWorkExcuteDeploy { - - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - - /** - * 部署中心工作，只需要将中心工作的状态修改为[执行中]即可 - * 维护中心工作干系人 - * @param id - * @throws Exception - */ - public void deploy( EntityManagerContainer emc, String id ) throws Exception { - OkrCenterWorkInfo okrCenterWorkInfo = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, can not deploy any center work!" ); - } - okrCenterWorkInfo = emc.find( id, OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null ){ - emc.beginTransaction( OkrCenterWorkInfo.class ); - okrCenterWorkInfo.setProcessStatus( "执行中" ); - emc.commit(); - //根据中心工作信息维护中心工作干系人信息 - okrWorkPersonService.saveCenterWorkPersonByCenterWork( okrCenterWorkInfo ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteSave.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteSave.java deleted file mode 100644 index 1b6c7a5035..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkExcuteSave.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrCenterWorkExcuteSave { - - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - - - /** - * 向数据库保存OkrCenterWorkInfo对象 - * @param wrapIn - */ - public OkrCenterWorkInfo save( EntityManagerContainer emc, OkrCenterWorkInfo okrCenterWorkInfo ) throws Exception { - List okrWorkPersonList = null; - OkrCenterWorkInfo okrCenterWorkInfo_old = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - List ids = null; - Business business = new Business(emc); - emc.beginTransaction( OkrWorkPerson.class ); - emc.beginTransaction( OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class ); - - if( okrCenterWorkInfo.getId() !=null && !okrCenterWorkInfo.getId().isEmpty() ){ - okrCenterWorkInfo_old = emc.find( okrCenterWorkInfo.getId(), OkrCenterWorkInfo.class ); - } - - if( okrCenterWorkInfo_old == null ){//保存新的中心工作信息 - okrCenterWorkInfo.setCreateTime( new Date() ); - okrCenterWorkInfo.setUpdateTime( okrCenterWorkInfo.getCreateTime() ); - emc.persist( okrCenterWorkInfo, CheckPersistType.all); - }else{//更新中心工作信息 - //如果当前的标题和原来的标题不一致，那么需要修改所有具体工作项目的中心工作标题 - if( !okrCenterWorkInfo_old.getTitle().equals( okrCenterWorkInfo.getTitle()) ){ - ids = business.okrWorkBaseInfoFactory().listByCenterWorkId( okrCenterWorkInfo.getId(), null ); - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - okrWorkBaseInfo = emc.find( id, OkrWorkBaseInfo.class ); - if( okrWorkBaseInfo != null ){ - okrWorkBaseInfo.setCenterTitle( okrCenterWorkInfo.getTitle() ); - emc.check( okrWorkBaseInfo, CheckPersistType.all ); - } - } - } - } - String sequence = okrCenterWorkInfo_old.getSequence(); - okrCenterWorkInfo.setCreateTime( okrCenterWorkInfo_old.getCreateTime() ); - okrCenterWorkInfo.copyTo( okrCenterWorkInfo_old, JpaObject.FieldsUnmodify ); - okrCenterWorkInfo_old.setSequence(sequence); - emc.check( okrCenterWorkInfo_old, CheckPersistType.all ); - } - //删除原先所有的干系人信息，先查询该中心工作信息注册的所有干系人信息列表 - ids = okrWorkPersonService.listIdsForCenterWorkByCenterId( okrCenterWorkInfo.getId(), null ); - okrWorkPersonList = business.okrWorkPersonFactory().list( ids ); - if( okrWorkPersonList != null && okrWorkPersonList.size() > 0 ){ - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - emc.remove( okrWorkPerson, CheckRemoveType.all ); - } - } - //保存中心工作的干系人信息，先根据中心工作信息来获取工作所有的干系人对象信息 - okrWorkPersonList = okrWorkPersonService.getWorkPersonListByCenterWorkInfo( okrCenterWorkInfo ); - if( okrWorkPersonList != null && okrWorkPersonList.size() > 0 ){ - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - okrWorkPerson.setWorkProcessStatus( "草稿" ); - emc.persist( okrWorkPerson, CheckPersistType.all); - } - } - emc.commit(); - return okrCenterWorkInfo; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkOperationService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkOperationService.java deleted file mode 100644 index 8fba6258a5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkOperationService.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.x.okr.assemble.control.service; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.entity.OkrCenterWorkInfo; - -public class OkrCenterWorkOperationService { - - private static Logger logger = LoggerFactory.getLogger( OkrCenterWorkOperationService.class ); - private OkrCenterWorkExcuteArchive okrCenterWorkExcuteArchive = new OkrCenterWorkExcuteArchive(); - private OkrCenterWorkExcuteDelete okrCenterWorkExcuteDelete = new OkrCenterWorkExcuteDelete(); - private OkrCenterWorkExcuteDeploy okrCenterWorkExcuteDeploy = new OkrCenterWorkExcuteDeploy(); - private OkrCenterWorkExcuteSave okrCenterWorkExcuteSave = new OkrCenterWorkExcuteSave(); - - - - /** - * 向数据库保存OkrCenterWorkInfo对象 - * @param wrapIn - */ - public OkrCenterWorkInfo save( OkrCenterWorkInfo okrCenterWorkInfo ) throws Exception { - if( okrCenterWorkInfo == null ){ - throw new Exception("okrCenterWorkInfo is null!"); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkInfo = okrCenterWorkExcuteSave.save( emc, okrCenterWorkInfo ); - }catch( Exception e ){ - logger.warn( "OkrCenterWorkInfo update/ get a error!" ); - throw e; - } - return okrCenterWorkInfo; - } - - /** - * 根据ID从数据库中删除OkrCenterWorkInfo对象 - * 同时删除所有的下级工作以及工作的相关汇报，请示等等 - * @param id - * @throws Exception - */ - public void delete( String centerId ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkExcuteDelete.delete( emc, centerId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据ID从归档OkrCenterWorkInfo对象 - * 同时归档所有的下级工作以及工作的相关汇报，请示等等 - * 并且删除所有待办 - * @param id - * @throws Exception - */ - public void archive( String centerId ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not archive any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkExcuteArchive.archive( emc, centerId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 部署中心工作，只需要将中心工作的状态修改为[执行中]即可 - * 维护中心工作干系人 - * @param id - * @throws Exception - */ - public void deploy( String centerId ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not deploy any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkExcuteDeploy.deploy( emc, centerId ); - } catch ( Exception e ) { - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkQueryService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkQueryService.java deleted file mode 100644 index 596193597c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrCenterWorkQueryService.java +++ /dev/null @@ -1,308 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrCenterWorkQueryService { - - private static Logger logger = LoggerFactory.getLogger( OkrCenterWorkQueryService.class ); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoService = new OkrWorkBaseInfoQueryService(); - - /** - * 根据传入的ID从数据库查询OkrCenterWorkInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrCenterWorkInfo get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find( id, OkrCenterWorkInfo.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 查询下一页的信息数据，直接调用Factory里的方法 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listNextWithFilter( String id, Integer count, WorkCommonQueryFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if ( !StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrCenterWorkInfo.class ), JpaObject.sequence_FIELDNAME ); - } - } - return business.okrCenterWorkInfoFactory().listNextWithFilter(id, count, sequence, wrapIn); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 查询上一页的信息数据，直接调用Factory里的方法 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listPrevWithFilter( String id, Integer count, WorkCommonQueryFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrCenterWorkInfo.class ), JpaObject.sequence_FIELDNAME ); - } - } - return business.okrCenterWorkInfoFactory().listPrevWithFilter(id, count, sequence, wrapIn); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 查询符合条件的数据总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getCountWithFilter( WorkCommonQueryFilter wrapIn ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrCenterWorkInfoFactory().getCountWithFilter(wrapIn); - } catch ( Exception e ) { - throw e; - } - } - - - /** - * 查询下一页的信息数据，直接调用Factory里的方法 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listCenterNextWithFilter( String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - List okrCenterWorkInfoList = new ArrayList(); - List okrWorkPersonList = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - wrapIn.setInfoType( "CENTERWORK" ); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //要根据ID和相应的条件在workPerson里查出指定的记录的sequence, 而不是中心工作表里的数据 - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - okrWorkPersonList = business.okrWorkPersonFactory().listCenterWorkPerson( id, wrapIn ); - if( okrWorkPersonList != null && !okrWorkPersonList.isEmpty() ){ - sequence = okrWorkPersonList.get( 0 ).getSequence(); - } - } - okrWorkPersonList = business.okrWorkPersonFactory().listNextWithFilter( id, count, sequence, wrapIn ); - if( okrWorkPersonList != null && !okrWorkPersonList.isEmpty() ){ - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - okrCenterWorkInfo = emc.find( okrWorkPerson.getCenterId(), OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null && !okrCenterWorkInfoList.contains( okrCenterWorkInfo )){ - okrCenterWorkInfoList.add( okrCenterWorkInfo ); - } - } - } - } catch ( Exception e ) { - throw e; - } - return okrCenterWorkInfoList; - } - - /** - * 查询上一页的信息数据，直接调用Factory里的方法 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listCenterPrevWithFilter( String id, Integer count, WorkCommonSearchFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - List okrCenterWorkInfoList = new ArrayList(); - List okrWorkPersonList = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - wrapIn.setInfoType( "CENTERWORK" ); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - //要根据ID和相应的条件在workPerson里查出指定的记录的sequence, 而不是中心工作表里的数据 - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - okrWorkPersonList = business.okrWorkPersonFactory().listCenterWorkPerson( id, wrapIn ); - if( okrWorkPersonList != null && !okrWorkPersonList.isEmpty() ){ - sequence = okrWorkPersonList.get( 0 ).getSequence(); - } - } - okrWorkPersonList = business.okrWorkPersonFactory().listPrevWithFilter(id, count, sequence, wrapIn); - if( okrWorkPersonList != null && !okrWorkPersonList.isEmpty() ){ - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - okrCenterWorkInfo = emc.find( okrWorkPerson.getCenterId(), OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null && !okrCenterWorkInfoList.contains( okrCenterWorkInfo )){ - okrCenterWorkInfoList.add( okrCenterWorkInfo ); - } - } - } - } catch ( Exception e ) { - throw e; - } - return okrCenterWorkInfoList; - } - - /** - * 查询符合条件的数据总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getCenterCountWithFilter( WorkCommonSearchFilter wrapIn ) throws Exception { - Business business = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - wrapIn.setInfoType( "CENTERWORK" ); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getCountWithFilter(wrapIn); - } catch ( Exception e ) { - throw e; - } - } - - public List listAllProcessingCenterWorkIds( List processStatus, List status ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrCenterWorkInfoFactory().listAllProcessingCenterWorkIds( processStatus, status ); - } catch ( Exception e ) { - throw e; - } - } - - public void countWorkWithCenterId(String centerId, List status) { - Long workTotal = 0L; - Long processingWorkCount = 0L; - Long completedWorkCount = 0L; - Long overtimeWorkCount = 0L; - Long draftWorkCount = 0L; - OkrCenterWorkInfo okrCenterWorkInfo = null; - try{ - workTotal = okrWorkBaseInfoService.getWorkTotalByCenterId( centerId, status ); - processingWorkCount = okrWorkBaseInfoService.getProcessingWorkCountByCenterId( centerId, status ); - completedWorkCount = okrWorkBaseInfoService.getCompletedWorkCountByCenterId( centerId, status ); - overtimeWorkCount = okrWorkBaseInfoService.getOvertimeWorkCountByCenterId( centerId, status ); - draftWorkCount = okrWorkBaseInfoService.getDraftWorkCountByCenterId( centerId, status ); - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkInfo = emc.find( centerId, OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null ){ - emc.beginTransaction(OkrCenterWorkInfo.class ); - okrCenterWorkInfo.setWorkTotal(workTotal); - okrCenterWorkInfo.setProcessingWorkCount(processingWorkCount); - okrCenterWorkInfo.setCompletedWorkCount(completedWorkCount); - okrCenterWorkInfo.setOvertimeWorkCount(overtimeWorkCount); - okrCenterWorkInfo.setDraftWorkCount(draftWorkCount); - if( workTotal > 0 && workTotal == completedWorkCount ){ - okrCenterWorkInfo.setProcessStatus("已完成"); - } - emc.check( okrCenterWorkInfo, CheckPersistType.all ); - emc.commit(); - }else{ - throw new Exception("okrCenterWorkInfo{'id':'"+centerId+"'} not exists."); - } - } catch ( Exception e ) { - throw e; - } - }catch(Exception e){ - logger.warn( "system count work info by center info got an exception." ); - logger.error( e ); - } - } - - public List listAllCenterWorks( String status ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrCenterWorkInfoFactory().listAllCenterWorks( status ); - } catch ( Exception e ) { - throw e; - } - } - - public OkrAttachmentFileInfo saveAttachment(String centerId, OkrAttachmentFileInfo attachment) throws Exception { - if( centerId == null ){ - throw new Exception( "centerId is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - OkrCenterWorkInfo center = emc.find( centerId, OkrCenterWorkInfo.class ); - if( center != null ){ - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrCenterWorkInfo.class ); - emc.persist(attachment, CheckPersistType.all ); - if( center.getAttachmentList()== null ) { - center.setAttachmentList( new ArrayList<>()); - } - if( !center.getAttachmentList().contains( attachment.getId() )) { - center.getAttachmentList().add( attachment.getId() ); - emc.check( center, CheckPersistType.all ); - } - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - return attachment; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSecretaryService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSecretaryService.java deleted file mode 100644 index c851fd7e20..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSecretaryService.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigSecretary; - -public class OkrConfigSecretaryService { - - private static Logger logger = LoggerFactory.getLogger( OkrConfigSecretaryService.class ); - - /** - * 根据传入的ID从数据库查询OkrConfigSecretary对象 - * @param id - * @return - * @throws Exception - */ - public OkrConfigSecretary get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find( id, OkrConfigSecretary.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrConfigSecretary对象 - * @param wrapIn - */ - public OkrConfigSecretary save( OkrConfigSecretary wrapIn ) throws Exception { - OkrConfigSecretary okrConfigSecretary = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigSecretary = emc.find( wrapIn.getId(), OkrConfigSecretary.class ); - if( okrConfigSecretary != null ){ - emc.beginTransaction( OkrConfigSecretary.class ); - wrapIn.copyTo( okrConfigSecretary, JpaObject.FieldsUnmodify ); - emc.check( okrConfigSecretary, CheckPersistType.all ); - emc.commit(); - }else{ - okrConfigSecretary = new OkrConfigSecretary(); - emc.beginTransaction( OkrConfigSecretary.class ); - wrapIn.copyTo( okrConfigSecretary ); - okrConfigSecretary.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - okrConfigSecretary.setUpdateTime( okrConfigSecretary.getCreateTime() ); - emc.persist( okrConfigSecretary, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrConfigSecretary update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigSecretary = new OkrConfigSecretary(); - emc.beginTransaction( OkrConfigSecretary.class ); - wrapIn.copyTo( okrConfigSecretary ); - emc.persist( okrConfigSecretary, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrConfigSecretary create got a error!", e); - throw e; - } - } - return okrConfigSecretary; - } - - /** - * 根据ID从数据库中删除OkrConfigSecretary对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrConfigSecretary okrConfigSecretary = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrConfigSecretary = emc.find(id, OkrConfigSecretary.class); - if (null == okrConfigSecretary) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrConfigSecretary.class ); - emc.remove( okrConfigSecretary, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public List listIdsByPerson( String name, String leaderName ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, return null!" ); - } - if( leaderName == null || leaderName.isEmpty() ){ - throw new Exception( "leaderName is null, return null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrConfigSecretaryFactory().listIdsByPerson( name, leaderName ); - }catch( Exception e ){ - throw e; - } - } - - public List listIdsByLeaderIdentity( String name, String leaderIdentity ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, return null!" ); - } - if( leaderIdentity == null || leaderIdentity.isEmpty() ){ - throw new Exception( "leaderIdentity is null, return null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrConfigSecretaryFactory().listIdsByLeaderIdentity( name, leaderIdentity ); - }catch( Exception e ){ - throw e; - } - } - - public List listIdsByPerson( String name ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, return null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - - - - - return business.okrConfigSecretaryFactory().listBySecretaryName( name ); - }catch( Exception e ){ - throw e; - } - } - - public List listByIds(List ids) throws Exception { - if( ids == null || ids.isEmpty() ){ - throw new Exception( "ids is null, return null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrConfigSecretaryFactory().list(ids); - }catch( Exception e ){ - throw e; - } - } - - public List listIdsByIdentities(List identities) throws Exception { - if( identities == null || identities.isEmpty() ){ - throw new Exception( "identities is null, return null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrConfigSecretaryFactory().listIdsByIdentities( identities ); - }catch( Exception e ){ - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSystemService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSystemService.java deleted file mode 100644 index 68f56974b7..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigSystemService.java +++ /dev/null @@ -1,504 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigSystem; - -/** - * 类 名：OkrConfigSystemService
- * 实体类：OkrConfigSystem
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrConfigSystemService{ - - private static Logger logger = LoggerFactory.getLogger( OkrConfigSystemService.class ); - - /** - * 根据传入的ID从数据库查询OkrConfigSystem对象 - * @param id - * @return - * @throws Exception - */ - public OkrConfigSystem get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrConfigSystem.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrConfigSystem对象 - * @param wrapIn - */ - public OkrConfigSystem save( OkrConfigSystem wrapIn ) throws Exception { - OkrConfigSystem okrConfigSystem = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigSystem = emc.find( wrapIn.getId(), OkrConfigSystem.class ); - if( okrConfigSystem != null ){ - emc.beginTransaction( OkrConfigSystem.class ); - wrapIn.copyTo( okrConfigSystem, JpaObject.FieldsUnmodify ); - emc.check( okrConfigSystem, CheckPersistType.all ); - emc.commit(); - }else{ - okrConfigSystem = new OkrConfigSystem(); - emc.beginTransaction( OkrConfigSystem.class ); - wrapIn.copyTo( okrConfigSystem ); - okrConfigSystem.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrConfigSystem, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrConfigSystem update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigSystem = new OkrConfigSystem(); - emc.beginTransaction( OkrConfigSystem.class ); - wrapIn.copyTo( okrConfigSystem ); - emc.persist( okrConfigSystem, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrConfigSystem create got a error!", e); - throw e; - } - } - return okrConfigSystem; - } - - /** - * 根据ID从数据库中删除OkrConfigSystem对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrConfigSystem okrConfigSystem = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrConfigSystem = emc.find(id, OkrConfigSystem.class); - if (null == okrConfigSystem) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrConfigSystem.class ); - emc.remove( okrConfigSystem, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据传入的ID从数据库查询OkrConfigSystem对象 - * @param id - * @return - * @throws Exception - */ - public String getValueWithConfigCode( String configCode ) throws Exception { - if( configCode == null || configCode.isEmpty() ){ - throw new Exception( "configCode is null!" ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrConfigSystemFactory().getValueWithConfigCode( configCode ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据传入的ID从数据库查询OkrConfigSystem对象 - * @param id - * @return - * @throws Exception - */ - public OkrConfigSystem getWithConfigCode( String configCode ) throws Exception { - if( configCode == null || configCode.isEmpty() ){ - throw new Exception( "configCode is null!" ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrConfigSystemFactory().getWithConfigCode(configCode); - }catch( Exception e ){ - throw e; - } - } - - public List listAll() throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrConfigSystemFactory().listAll(); - }catch( Exception e ){ - throw e; - } - } - - /** - * 检查配置项是否存在，如果不存在根据信息创建一个新的配置项 - * @param configCode - * @param configName - * @param configValue - * @param description - * @throws Exception - */ - public void checkAndInitSystemConfig( String configCode, String configName, String configValue, String description, String type, String selectContent, Boolean isMultiple, Integer orderNumber ) throws Exception { - if( configCode == null || configCode.isEmpty() ){ - throw new Exception( "configCode is null!" ); - } - if( configName == null || configName.isEmpty() ){ - throw new Exception( "configName is null!" ); - } - Business business = null; - OkrConfigSystem okrConfigSystem = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - okrConfigSystem = business.okrConfigSystemFactory().getWithConfigCode( configCode ); - }catch( Exception e ){ - logger.warn( "system find system config{'configCode':'"+configCode+"'} got an exception. " ); - throw e; - } - //如果配置不存在，则新建一个配置记录 - if( okrConfigSystem == null ){ - okrConfigSystem = new OkrConfigSystem(); - okrConfigSystem.setConfigCode( configCode ); - okrConfigSystem.setConfigName( configName ); - okrConfigSystem.setConfigValue( configValue ); - okrConfigSystem.setDescription( description ); - okrConfigSystem.setOrderNumber( orderNumber ); - okrConfigSystem.setValueType( type ); - okrConfigSystem.setSelectContent( selectContent ); - okrConfigSystem.setIsMultiple( isMultiple ); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - emc.beginTransaction( OkrConfigSystem.class ); - emc.persist( okrConfigSystem, CheckPersistType.all ); - //logger.info("系统参数基础信息已经被新增：" + okrConfigSystem.getConfigCode() + "[" + okrConfigSystem.getConfigName()+ "]."); - emc.commit(); - }catch( Exception e ){ - logger.warn("system persist new system config{'configCode':'"+configCode+"'} got an exception. " ); - throw e; - } - }else{ - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - okrConfigSystem = emc.find( okrConfigSystem.getId(), OkrConfigSystem.class ); - emc.beginTransaction( OkrConfigSystem.class ); - if( !configName.equals( okrConfigSystem.getConfigName() ) ){ - okrConfigSystem.setConfigName( configName ); - } - if( orderNumber != okrConfigSystem.getOrderNumber() ){ - okrConfigSystem.setOrderNumber(orderNumber); - } - if( description != null ){ - okrConfigSystem.setDescription( description ); - } - if( type != null ){ - okrConfigSystem.setValueType( type ); - } - if( selectContent != null ){ - okrConfigSystem.setSelectContent( selectContent ); - } - if( isMultiple != null ){ - okrConfigSystem.setIsMultiple( isMultiple ); - } - emc.check( okrConfigSystem, CheckPersistType.all ); - emc.commit(); - //logger.info("系统参数基础信息已经被更新：" + okrConfigSystem.getConfigCode() + "[" + okrConfigSystem.getConfigName()+ "]."); - }catch( Exception e ){ - logger.warn("system update system config{'configCode':'"+configCode+"'} got an exception. "); - throw e; - } - } - } - - /** - * REPORT_WORKFLOW_TYPE 工作汇报工作流方式 ADMIN_AND_ALLLEADER - REPORT_SUPERVISOR 汇报督办员身份 蔡艳红(O2研发团队) - REPORT_AUDIT_LEADER 汇报审阅领导 周睿(O2研发团队),胡起(O2研发团队),刘振兴(O2研发团队) - REPORT_AUDIT_LEVEL 汇报审阅控制层级 1 - TOPUNIT_WORK_ADMIN 顶层组织工作管理员 蔡艳红(O2研发团队) - * @throws Exception - */ - public void initAllSystemConfig() throws Exception { - String value = null, description = null, type = null, selectContent = null; - Boolean isMultiple = false; - Integer ordernumber = 0; - - value = ""; - type = "identity"; - selectContent = null; - isMultiple = true; - description = "顶层组织工作管理员：可选值为指定的人员身份，可多值。顶层组织工作管理可以进行工作部署，其他人员不允许进行工作部署。（暂定配置，后续使用权限设计实现）。"; - try { - checkAndInitSystemConfig("TOPUNIT_WORK_ADMIN", "顶层组织工作管理员", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'TOPUNIT_WORK_ADMIN' got an exception." ); - throw e; - } - - /** - * 汇报流程方式 - * reportWorkflowType = ADMIN_AND_ALLLEADER - 经过工作管理员和所有的批示领导 - * reportWorkflowType = DEPLOYER - 工作部署者审核（默认） - */ - value = "DEPLOYER"; - type = "select"; - selectContent = "ADMIN_AND_ALLLEADER|DEPLOYER"; - isMultiple = false; - description = "汇报流程方式：可选值：ADMIN_AND_ALLLEADER|DEPLOYER。值为ADMIN_AND_ALLLEADER时工作汇报处理需经过汇报督办员身份和所有的批示领导，否则仅需要部署者审核即可。"; - try { - checkAndInitSystemConfig("REPORT_WORKFLOW_TYPE", "工作汇报工作流方式", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_WORKFLOW_TYPE' got an exception." ); - throw e; - } - - value = null; - type = "identity"; - selectContent = null; - isMultiple = false; - description = "汇报督办员身份：可选值为指定的人员身份，单值。该配置与汇报流程方式中的ADMIN_AND_ALLLEADER配合使用"; - try { - checkAndInitSystemConfig("REPORT_SUPERVISOR", "汇报督办员身份", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_SUPERVISOR' got an exception." ); - throw e; - } - - value = null; - type = "identity"; - selectContent = null; - isMultiple = true; - description = "汇报审阅领导：可选值为指定的人员身份，多值以半角“,”分隔。默认的汇报审阅领导，创建中心工作时取默认领导，编辑时可修改作为具体中心工作的汇报审阅领导。"; - try { - checkAndInitSystemConfig("REPORT_AUDIT_LEADER", "汇报审阅领导", value, description, type, selectContent, isMultiple , ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_AUDIT_LEADER' got an exception." ); - throw e; - } - - value = "1"; - type = "number"; - selectContent = null; - isMultiple = false; - description = "汇报审阅控制层级：可选值为数字。该配置指定配置ADMIN_AND_ALLLEADER控制的工作层级（LEVEL）数，控制之外的工作汇报审批方式指定为DEPLOYER，即审阅人为部署者。"; - try { - checkAndInitSystemConfig("REPORT_AUDIT_LEVEL", "汇报审阅控制层级", value, description, type, selectContent, isMultiple , ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_AUDIT_LEVEL' got an exception." ); - throw e; - } - - value = "OPEN"; - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "定期汇报自动生成：可选值[OPEN|CLOSE]。此配置控制是否在系统中启用定期生成汇报拟稿功能。"; - try { - checkAndInitSystemConfig("REPORT_AUTOCREATE", "定期汇报自动生成", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_AUTOCREATE' got an exception." ); - throw e; - } - - value = "10:00:00"; //10:00:00 - type = "time"; - selectContent = null; - isMultiple = false; - description = "定期汇报生成时间：配置值格式为[hh24:mi:ss]。此配置控制定期汇报的启动时间，值为时分秒格式，默认：10:00:00。"; - try { - checkAndInitSystemConfig("REPORT_CREATETIME", "定期汇报生成时间", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_CREATETIME' got an exception." ); - throw e; - } - - value = "OPEN"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "用户工作汇报功能：可选值[OPEN|CLOSE]。此配置控制是否在系统中允许用户自主进行工作汇报拟稿功能。"; - try { - checkAndInitSystemConfig("REPORT_USERCREATE", "用户工作汇报功能", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_USERCREATE' got an exception." ); - throw e; - } - - value = "OPEN"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "汇报工作进度：可选值[OPEN|CLOSE]。此配置控制是否在用户进行工作汇报时要求填写工作的进度百分比以及是否已经完成的选择项，作为后统计依据。"; - try { - checkAndInitSystemConfig("REPORT_PROGRESS", "汇报工作进度", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_PROGRESS' got an exception." ); - throw e; - } - - value = "ICON"; //LIST|ICON - type = "select"; - selectContent = "LIST|ICON"; - isMultiple = false; - description = "脑图工作列表样式：可选值[LIST|ICON]。系统脑图展示中中心工作列表提供两种展现样式，普通列表和工作图标。"; - try { - checkAndInitSystemConfig("MIND_LISTSTYLE", "脑图工作列表样式", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'MIND_LISTSTYLE' got an exception." ); - throw e; - } - - value = "OPEN"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "工作授权功能：可选值[OPEN|CLOSE]。此配置控制是否在系统中启用工作授权功能。"; - try { - checkAndInitSystemConfig("WORK_AUTHORIZE", "工作授权功能", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'WORK_AUTHORIZE' got an exception." ); - throw e; - } - - value = "NONE"; //NONE|READ|TASK - type = "select"; - selectContent = "NONE|READ|TASK"; - isMultiple = false; - description = "工作授权人汇报通知方式：可选值[NONE|READ|TASK]。此配置控制工作负责人提交工作汇报时以何种方式通知授权人，或者不通知授权人。"; - try { - checkAndInitSystemConfig("REPORT_AUTHOR_NOTICE", "汇报通知授权人方式", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_AUTHOR_NOTICE' got an exception." ); - throw e; - } - - value = "CLOSE"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "汇报审核进展通知：可选值[OPEN|CLOSE]。此配置控制工作汇报被领导审核后是否以待阅方式通知汇报人。"; - try { - checkAndInitSystemConfig("REPORTOR_AUDIT_NOTICE", "汇报审核进展通知", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORTOR_AUDIT_NOTICE' got an exception." ); - throw e; - } - - value = "OPEN"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "工作拆分功能：可选值[OPEN|CLOSE]。此配置控制系统内工作部署后，是否允许责任者进行下一级的工作拆解。"; - try { - checkAndInitSystemConfig("WORK_DISMANTLING", "工作拆分功能", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'WORK_DISMANTLING' got an exception." ); - throw e; - } - - value = "OPEN"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "首页工作状态列表：可选值[OPEN|CLOSE]。此配置控制系统首页是否展示工作状态列表的TAB页。"; - try { - checkAndInitSystemConfig("INDEX_WORK_STATUSLIST", "首页工作状态列表", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'INDEX_WORK_STATUSLIST' got an exception." ); - throw e; - } - - value = "PROMPTNESSRATE"; //PROMPTNESSRATE|COMPLETIONRATE - type = "select"; - selectContent = "PROMPTNESSRATE|COMPLETIONRATE"; - isMultiple = false; - description = "首页统计状态类别：可选值[PROMPTNESSRATE|COMPLETIONRATE]。此配置控制系统首页统计显示的内容，及时率统计或完成率统计。"; - try { - checkAndInitSystemConfig("INDEX_STATISTIC_TYPE", "首页统计状态类别", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'INDEX_STATISTIC_TYPE' got an exception." ); - throw e; - } - - value = ""; //可以执行归档的用户身份列表，多值，可以用,号分隔 - type = "identity"; - selectContent = null; - isMultiple = true; - description = "工作归档管理员：可选值为指定的人员身份，多值以半角“,”分隔。此配置控制系统中可以对中心工作进行归档操作的用户。"; - try { - checkAndInitSystemConfig("ARCHIVEMANAGER", "工作归档管理员", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'ARCHIVEMANAGER' got an exception." ); - throw e; - } - - value = "OPEN"; //OPEN|CLOSE - type = "select"; - selectContent = "OPEN|CLOSE"; - isMultiple = false; - description = "工作汇报自动结束：可选值[OPEN|CLOSE]。此配置控制系统是否会在生成新的汇报时自动结束已经存在的工作汇报信息，删除之前的汇报待办信息。"; - try { - checkAndInitSystemConfig("REPORT_AUTO_OVER", "工作汇报自动结束", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'REPORT_AUTO_OVER' got an exception." ); - throw e; - } - - value = "0"; - type = "number"; - selectContent = ""; - isMultiple = false; - description = "工作考核流程发起次数：可选值[数值]。此配置控制系统能发起考核流程的次数，如果为0，则不允许发起。"; - try { - checkAndInitSystemConfig("APPRAISE_MAX_TIMES", "工作考核流程发起次数", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'APPRAISE_MAX_TIMES' got an exception." ); - throw e; - } - - value = "NONE"; - type = "workflow"; - selectContent = ""; - isMultiple = false; - description = "工作考核流程ID：指定发起工作考核流程时使用的流程ID."; - try { - checkAndInitSystemConfig("APPRAISE_WORKFLOW_ID", "工作考核流程ID", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'APPRAISE_WORKFLOW_ID' got an exception." ); - logger.error(e); - } - - value = "NONE"; - type = "text"; - selectContent = ""; - isMultiple = false; - description = "短信接口WSDL地址."; - try { - checkAndInitSystemConfig("SMS_WSDL", "短信接口WSDL地址", value, description, type, selectContent, isMultiple, ++ordernumber ); - } catch (Exception e) { - logger.warn( "system init system config 'SMS_WSDL' got an exception." ); - logger.error(e); - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkLevelService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkLevelService.java deleted file mode 100644 index 8f3f420f61..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkLevelService.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigWorkLevel; - -/** - * 类 名：OkrConfigWorkLevelService
- * 实体类：OkrConfigWorkLevel
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrConfigWorkLevelService{ - - private static Logger logger = LoggerFactory.getLogger( OkrConfigWorkLevelService.class ); - /** - * 根据传入的ID从数据库查询OkrConfigWorkLevel对象 - * @param id - * @return - * @throws Exception - */ - public OkrConfigWorkLevel get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrConfigWorkLevel.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrConfigWorkLevel对象 - * @param wrapIn - */ - public OkrConfigWorkLevel save( OkrConfigWorkLevel wrapIn ) throws Exception { - OkrConfigWorkLevel okrConfigWorkLevel = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigWorkLevel = emc.find( wrapIn.getId(), OkrConfigWorkLevel.class ); - if( okrConfigWorkLevel != null ){ - emc.beginTransaction( OkrConfigWorkLevel.class ); - wrapIn.copyTo( okrConfigWorkLevel, JpaObject.FieldsUnmodify ); - emc.check( okrConfigWorkLevel, CheckPersistType.all ); - emc.commit(); - }else{ - okrConfigWorkLevel = new OkrConfigWorkLevel(); - emc.beginTransaction( OkrConfigWorkLevel.class ); - wrapIn.copyTo( okrConfigWorkLevel ); - okrConfigWorkLevel.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrConfigWorkLevel, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrConfigWorkLevel update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigWorkLevel = new OkrConfigWorkLevel(); - emc.beginTransaction( OkrConfigWorkLevel.class ); - wrapIn.copyTo( okrConfigWorkLevel ); - emc.persist( okrConfigWorkLevel, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrConfigWorkLevel create got a error!", e); - throw e; - } - } - return okrConfigWorkLevel; - } - - /** - * 根据ID从数据库中删除OkrConfigWorkLevel对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrConfigWorkLevel okrConfigWorkLevel = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrConfigWorkLevel = emc.find(id, OkrConfigWorkLevel.class); - if (null == okrConfigWorkLevel) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrConfigWorkLevel.class ); - emc.remove( okrConfigWorkLevel, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public List listAll() throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrConfigWorkLevelFactory().listAll(); - }catch( Exception e ){ - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkTypeService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkTypeService.java deleted file mode 100644 index ed21987d1a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrConfigWorkTypeService.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigWorkType; - -/** - * 类 名：OkrConfigWorkTypeService
- * 实体类：OkrConfigWorkType
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrConfigWorkTypeService{ - - private static Logger logger = LoggerFactory.getLogger( OkrConfigWorkTypeService.class ); - - /** - * 根据传入的ID从数据库查询OkrConfigWorkType对象 - * @param id - * @return - * @throws Exception - */ - public OkrConfigWorkType get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrConfigWorkType.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrConfigWorkType对象 - * @param wrapIn - */ - public OkrConfigWorkType save( OkrConfigWorkType wrapIn ) throws Exception { - OkrConfigWorkType okrConfigWorkType = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigWorkType = emc.find( wrapIn.getId(), OkrConfigWorkType.class ); - if( okrConfigWorkType != null ){ - emc.beginTransaction( OkrConfigWorkType.class ); - wrapIn.copyTo( okrConfigWorkType, JpaObject.FieldsUnmodify ); - emc.check( okrConfigWorkType, CheckPersistType.all ); - emc.commit(); - }else{ - okrConfigWorkType = new OkrConfigWorkType(); - emc.beginTransaction( OkrConfigWorkType.class ); - wrapIn.copyTo( okrConfigWorkType ); - okrConfigWorkType.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrConfigWorkType, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrConfigWorkType update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrConfigWorkType = new OkrConfigWorkType(); - emc.beginTransaction( OkrConfigWorkType.class ); - wrapIn.copyTo( okrConfigWorkType ); - emc.persist( okrConfigWorkType, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrConfigWorkType create got a error!", e); - throw e; - } - } - return okrConfigWorkType; - } - - /** - * 根据ID从数据库中删除OkrConfigWorkType对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrConfigWorkType okrConfigWorkType = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrConfigWorkType = emc.find(id, OkrConfigWorkType.class); - if (null == okrConfigWorkType) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrConfigWorkType.class ); - emc.remove( okrConfigWorkType, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public List listAll() throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrConfigWorkTypeFactory().listAll(); - }catch( Exception e ){ - throw e; - } - } - - public List listAllTypeName() throws Exception { - List workTypeList = null; - List workTypeNameList = new ArrayList<>(); - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - workTypeList = business.okrConfigWorkTypeFactory().listAll(); - if( workTypeList != null && !workTypeList.isEmpty() ){ - for( OkrConfigWorkType type : workTypeList ){ - workTypeNameList.add( type.getWorkTypeName() ); - } - } - }catch( Exception e ){ - throw e; - } - return workTypeNameList; - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSendNotifyService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSendNotifyService.java deleted file mode 100644 index 7c34844093..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSendNotifyService.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.project.tools.ListTools; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class OkrSendNotifyService { - - /** - * 通知部署者中心工作部署完成 - * - * @param OkrCenterWorkInfo - * @throws Exception - */ - public void notifyDeployerForCenterWorkDeploySuccess(OkrCenterWorkInfo okrCenterWorkInfo) throws Exception { - if (okrCenterWorkInfo != null) { - String targetName = okrCenterWorkInfo.getDeployerName(); - String messageContent = "中心工作[" + okrCenterWorkInfo.getTitle() + "]已经部署成功。"; - if (targetName != null && !targetName.isEmpty()) { - String[] array = targetName.split(","); - for (String name : array) { - if (name != null && !name.trim().isEmpty()) { -// OkrCenterWorkDeployAcceptMessage message = new OkrCenterWorkDeployAcceptMessage( name, okrCenterWorkInfo.getId(), okrCenterWorkInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrCenterWorkInfo is null, can not send message!"); - } - } - - /** - * 通知部署者工作部署完成 - * - * @param OkrCenterWorkInfo - * @throws Exception - */ - public void notifyDeployerForWorkDeploySuccess(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (okrWorkBaseInfo != null) { - String targetName = okrWorkBaseInfo.getDeployerName(); - String messageContent = "工作[" + okrWorkBaseInfo.getTitle() + "]已经部署成功。"; - if (targetName != null && !targetName.isEmpty()) { - String[] array = targetName.split(","); - for (String name : array) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkDeployAcceptMessage message = new OkrWorkDeployAcceptMessage( name, okrWorkBaseInfo.getId(), okrWorkBaseInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrWorkBaseInfo is null, can not send message!"); - } - } - - /** - * 通知工作主责人收到一个新工作，需要进行确认 - * - * @param okrWorkBaseInfo - * @throws Exception - */ - public void notifyResponsibilityForGetWork(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (okrWorkBaseInfo != null) { - String targetName = okrWorkBaseInfo.getResponsibilityEmployeeName(); - String messageContent = "收到一个新的工作[" + okrWorkBaseInfo.getTitle() + "]，请及时确认工作。"; - if (targetName != null && !targetName.isEmpty()) { - String[] array = targetName.split(","); - for (String name : array) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkGetAcceptMessage message = new OkrWorkGetAcceptMessage( name, okrWorkBaseInfo.getId(), okrWorkBaseInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrWorkBaseInfo is null, can not send message!"); - } - } - - /** - * 通知工作协助人收到一个新工作 - * - * @param okrWorkBaseInfo - * @throws Exception - */ - public void notifyCooperaterForGetWork(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (okrWorkBaseInfo != null) { - List targetNames = okrWorkBaseInfo.getCooperateEmployeeNameList(); - String messageContent = "收到一个需要您协助的工作[" + okrWorkBaseInfo.getTitle() + "]，责任者：[" - + okrWorkBaseInfo.getResponsibilityEmployeeName() + "]，请协助执行。"; - if (ListTools.isNotEmpty(targetNames)) { - for (String name : targetNames) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkGetAcceptMessage message = new OkrWorkGetAcceptMessage( name, okrWorkBaseInfo.getId(), okrWorkBaseInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrWorkBaseInfo is null, can not send message!"); - } - } - - /** - * 通知工作协助人工作已经被删除 - * - * @param okrWorkBaseInfo - * @throws Exception - */ - public void notifyCooperaterForWorkDeleted(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (okrWorkBaseInfo != null) { - List targetNames = okrWorkBaseInfo.getCooperateEmployeeNameList(); - String messageContent = "您协助的工作[" + okrWorkBaseInfo.getTitle() + "]已被删除。"; - if (ListTools.isNotEmpty(targetNames)) { - for (String name : targetNames) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkDeletedAcceptMessage message = new OkrWorkDeletedAcceptMessage( name, okrWorkBaseInfo.getId(), okrWorkBaseInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrWorkBaseInfo is null, can not send message!"); - } - } - - /** - * 通知部署者工作已被删除 - * - * @param okrWorkBaseInfo - * @throws Exception - */ - public void notifyDeployerForWorkDeletedSuccess(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (okrWorkBaseInfo != null) { - String targetName = okrWorkBaseInfo.getDeployerName(); - String messageContent = "您部署的工作[" + okrWorkBaseInfo.getTitle() + "]已被成功删除。"; - if (targetName != null && !targetName.isEmpty()) { - String[] array = targetName.split(","); - for (String name : array) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkDeletedAcceptMessage message = new OkrWorkDeletedAcceptMessage( name, okrWorkBaseInfo.getId(), okrWorkBaseInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrWorkBaseInfo is null, can not send message!"); - } - } - - /** - * 通知工作主责人工作已经被删除 - * - * @param okrWorkBaseInfo - * @throws Exception - */ - public void notifyResponsibilityForWorkDeleted(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (okrWorkBaseInfo != null) { - String targetName = okrWorkBaseInfo.getResponsibilityEmployeeName(); - String messageContent = "您负责的工作[" + okrWorkBaseInfo.getTitle() + "]已被删除。"; - if (targetName != null && !targetName.isEmpty()) { - String[] array = targetName.split(","); - for (String name : array) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkDeletedAcceptMessage message = new OkrWorkDeletedAcceptMessage( name, okrWorkBaseInfo.getId(), okrWorkBaseInfo.getTitle(), messageContent ); -// Collaboration.send(message); - } - } - } - } else { - throw new Exception("okrWorkBaseInfo is null, can not send message!"); - } - } - - /** - * 通知操作人，汇报信息删除成功 - * - * @param okrWorkReportBaseInfo - * @throws Exception - */ - public void notifyReportDeleteSuccess(OkrWorkReportBaseInfo okrWorkReportBaseInfo, String operator) - throws Exception { - if (okrWorkReportBaseInfo != null) { - String targetName = operator; - String messageContent = "工作汇报[" + okrWorkReportBaseInfo.getTitle() + "]已成功删除。"; - if (targetName != null && !targetName.isEmpty()) { - String[] array = targetName.split(","); - for (String name : array) { - if (name != null && !name.trim().isEmpty()) { -// OkrWorkReportDeletedAcceptMessage message = new OkrWorkReportDeletedAcceptMessage( name, okrWorkReportBaseInfo.getId(), okrWorkReportBaseInfo.getTitle(), messageContent ); -// Collaboration.send( message ); - } - } - } - } else { - throw new Exception("okrWorkReportBaseInfo is null, can not send message!"); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportContentService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportContentService.java deleted file mode 100644 index 35940f7b0d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportContentService.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrStatisticReportContent; - -/** - * 类 名：OkrStatisticReportContentService
- * 实体类：OkrStatisticReportContent
- * 作 者：Liyi
- * 单 位：O2 Team
O - * 日 期：2016-05-20 17:17:26 -**/ -public class OkrStatisticReportContentService{ - - public OkrStatisticReportContent save( OkrStatisticReportContent statisticReportContent ) throws Exception { - if( statisticReportContent == null ){ - throw new Exception( "statisticReportContent is null, system can not save entity!" ); - } - List ids = null; - Business business = null; - OkrStatisticReportContent _statisticReportContent = null; - Integer count = 0; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - emc.beginTransaction( OkrStatisticReportContent.class ); - - //查询数据库中是否已经存在该中心工作该周的每月统计信息，如果存在则进行更新，如果不存在则进行保存 - ids = business.okrStatisticReportContentFactory().list( - statisticReportContent.getWorkId(), - statisticReportContent.getStatisticYear(), - statisticReportContent.getStatisticMonth(), - statisticReportContent.getStatisticWeek(), - statisticReportContent.getCycleType() - ); - if( ids != null && !ids.isEmpty() ){ - //更新统计记录 - for( String id : ids ){ - _statisticReportContent = emc.find( id, OkrStatisticReportContent.class ); - if( _statisticReportContent != null ){ - if( count == 0 ){ - _statisticReportContent.setStatisticTime( statisticReportContent.getStatisticTime() ); - _statisticReportContent.setStatisticTimeFlag( statisticReportContent.getStatisticTimeFlag() ); - _statisticReportContent.setCenterId( statisticReportContent.getCenterId() ); - _statisticReportContent.setCenterTitle( statisticReportContent.getCenterTitle() ); - _statisticReportContent.setParentId( statisticReportContent.getParentId() ); - _statisticReportContent.setWorkId( statisticReportContent.getWorkId() ); - _statisticReportContent.setWorkTitle( statisticReportContent.getWorkTitle() ); - _statisticReportContent.setWorkType( statisticReportContent.getWorkType() ); - _statisticReportContent.setWorkLevel( statisticReportContent.getWorkLevel() ); - _statisticReportContent.setIsCompleted( statisticReportContent.getIsCompleted() ); - _statisticReportContent.setIsOverTime( statisticReportContent.getIsOverTime() ); - _statisticReportContent.setStatisticYear( statisticReportContent.getStatisticYear() ); - _statisticReportContent.setStatisticMonth( statisticReportContent.getStatisticMonth() ); - _statisticReportContent.setStatisticWeek( statisticReportContent.getStatisticWeek() ); - _statisticReportContent.setCycleType( statisticReportContent.getCycleType() ); - _statisticReportContent.setReportDayInCycle( statisticReportContent.getReportDayInCycle() ); - _statisticReportContent.setReportId( statisticReportContent.getReportId() ); - _statisticReportContent.setResponsibilityTopUnitName( statisticReportContent.getResponsibilityTopUnitName() ); - _statisticReportContent.setResponsibilityEmployeeName( statisticReportContent.getResponsibilityEmployeeName() ); - _statisticReportContent.setResponsibilityIdentity( statisticReportContent.getResponsibilityIdentity() ); - _statisticReportContent.setResponsibilityUnitName( statisticReportContent.getResponsibilityUnitName() ); - _statisticReportContent.setReportStatus( statisticReportContent.getReportStatus() ); - _statisticReportContent.setWorkPlan( statisticReportContent.getWorkPlan() ); - _statisticReportContent.setAdminSuperviseInfo( statisticReportContent.getAdminSuperviseInfo() ); - _statisticReportContent.setProgressDescription( statisticReportContent.getProgressDescription() ); - _statisticReportContent.setWorkPointAndRequirements( statisticReportContent.getWorkPointAndRequirements() ); - _statisticReportContent.setMemo( statisticReportContent.getMemo() ); - _statisticReportContent.setOpinion( statisticReportContent.getOpinion() ); - _statisticReportContent.setWorkProcessStatus( statisticReportContent.getWorkProcessStatus() ); - _statisticReportContent.setStatus( statisticReportContent.getStatus() ); - emc.check( _statisticReportContent, CheckPersistType.all ); - }else{ - emc.remove( _statisticReportContent, CheckRemoveType.all ); - } - count ++; - } - } - }else{ - //保存统计记录 - emc.persist( statisticReportContent, CheckPersistType.all ); - } - emc.commit(); - }catch( Exception e ){ - throw e; - } - return statisticReportContent; - } - - /** - * 根据传入的ID从数据库查询OkrStatisticReportContent对象 - * @param id - * @return - * @throws Exception - */ - public OkrStatisticReportContent get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrStatisticReportContent.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据ID从数据库中删除OkrStatisticReportContent对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrStatisticReportContent okrCenterWorkReportStatistic = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrCenterWorkReportStatistic = emc.find(id, OkrStatisticReportContent.class); - if (null == okrCenterWorkReportStatistic) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrStatisticReportContent.class ); - emc.remove( okrCenterWorkReportStatistic, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据条件获取统计信息列表 - * @param workTypeName - * @param reportCycle - * @param year - * @param month - * @param week - * @return - * @throws Exception - */ - public List list( String centerId, String centerTitle, String parentId, String workType, String statisticTime, String reportCycle, Integer year, Integer month, Integer week, String stauts ) throws Exception { - Business business = null; - Long count = 0L; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - count = business.okrStatisticReportContentFactory().count( centerId, centerTitle, parentId, workType, statisticTime, reportCycle, year, month, week, stauts ); - if( count > 0 ){ - return business.okrStatisticReportContentFactory().list( centerId, centerTitle, parentId, workType, statisticTime, reportCycle, year, month, week, stauts ); - }else{ - return null; - } - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据Id获取统计信息列表 - * @return - * @throws Exception - */ - public List list( List ids ) throws Exception { - if( ids == null || ids.isEmpty() ){ - return null; - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrStatisticReportContentFactory().list( ids ); - }catch( Exception e ){ - throw e; - } - } - - public List listDateTimeFlags(String centerId, String centerTitle, String workId, String workType, String reportCycle, - Integer year, Integer month, Integer week, Date startDate, Date endDate, String status) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrStatisticReportContentFactory().listDateTimeFlags( centerId, centerTitle, workId, workType, reportCycle, year, month, week, startDate, endDate, status ); - }catch( Exception e ){ - throw e; - } - } - - public List listFirstLayer(String centerId, String centerTitle, String workId, String workType, String statisticTimeFlag, String reportCycle, Integer year, Integer month, Integer week, String stauts) throws Exception { - Business business = null; - Long count = 0L; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - count = business.okrStatisticReportContentFactory().countFirstLayer( centerId, centerTitle, workId, workType, statisticTimeFlag, reportCycle, year, month, week, stauts ); - if( count > 0 ){ - return business.okrStatisticReportContentFactory().listFirstLayer( centerId, centerTitle, workId, workType, statisticTimeFlag, reportCycle, year, month, week, stauts ); - }else{ - return null; - } - }catch( Exception e ){ - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportStatusService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportStatusService.java deleted file mode 100644 index 9d629edc31..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrStatisticReportStatusService.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrStatisticReportStatus; - -/** - * 类 名：OkrStatisticReportStatusService
- * 实体类：OkrStatisticReportStatus
- * 作 者：Liyi
- * 单 位：O2 Team
O - * 日 期：2016-05-20 17:17:26 -**/ -public class OkrStatisticReportStatusService{ - private static Logger logger = LoggerFactory.getLogger( OkrStatisticReportStatusService.class ); - - /** - * 根据传入的ID从数据库查询OkrStatisticReportStatus对象 - * @param id - * @return - * @throws Exception - */ - public OkrStatisticReportStatus get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrStatisticReportStatus.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据ID从数据库中删除OkrStatisticReportStatus对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrStatisticReportStatus okrCenterWorkReportStatistic = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrCenterWorkReportStatistic = emc.find(id, OkrStatisticReportStatus.class); - if (null == okrCenterWorkReportStatistic) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrStatisticReportStatus.class ); - emc.remove( okrCenterWorkReportStatistic, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public OkrStatisticReportStatus save( OkrStatisticReportStatus statistic ) throws Exception { - if( statistic == null ){ - throw new Exception( "okrReportStatusStatistic is null, return null!" ); - } - List list = null; - OkrStatisticReportStatus _okrReportStatusStatistic = null; - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - list = business.okrStatisticReportStatusFactory().listWithWorkId( statistic.getWorkId() ); - emc.beginTransaction( OkrStatisticReportStatus.class ); - if( list != null && !list.isEmpty() ){ - for( int i=0; i< list.size(); i++ ){ - if( i == 0 ){ - _okrReportStatusStatistic = list.get(i); - } - if( i > 0 ){ - emc.remove( list.get(i), CheckRemoveType.all ); - } - } - } - if( _okrReportStatusStatistic != null ){ - _okrReportStatusStatistic.setReportStatistic( statistic.getReportStatistic() ); - emc.check( _okrReportStatusStatistic, CheckPersistType.all ); - }else{ - emc.persist( statistic, CheckPersistType.all ); - } - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrConfigWorkLevel update/ got a error!" ); - throw e; - } - return statistic; - } - - - public List list( List ids ) throws Exception { - if( ids == null ){ - throw new Exception( "ids is null, return null!" ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrStatisticReportStatusFactory().list( ids ); - }catch( Exception e ){ - throw e; - } - } - - public List list(String centerId, String centerTitle, String workId, String workType, String unitName, String cycleType, String status ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrStatisticReportStatusFactory().list( centerId, centerTitle, workId, workType, unitName, cycleType, status ); - }catch( Exception e ){ - throw e; - } - } - - public List listIds(String centerId, String workId, String unitName, String cycleType, String status ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business( emc ); - return business.okrStatisticReportStatusFactory().listIds( centerId, workId, unitName, cycleType, status ); - }catch( Exception e ){ - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityOperatorService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityOperatorService.java deleted file mode 100644 index a96b04b5e6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityOperatorService.java +++ /dev/null @@ -1,1126 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.google.gson.Gson; -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.assemble.control.jaxrs.identity.entity.ErrorIdentityRecord; -import com.x.okr.assemble.control.jaxrs.identity.entity.ErrorIdentityRecords; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrConfigSecretary; -import com.x.okr.entity.OkrConfigSystem; -import com.x.okr.entity.OkrErrorIdentityRecords; -import com.x.okr.entity.OkrErrorSystemIdentityInfo; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; - -/** - * 全系统范围内处理人员身份问题 - * 1、全系统身份替换功能 - 2、无效身份检查功能 - 1)无效身份涉及的数据展现出来 - 2)无效身份的替换 - * - */ -public class OkrSystemIdentityOperatorService { - private static Logger logger = LoggerFactory.getLogger( OkrSystemIdentityOperatorService.class ); - OkrSystemIdentityQueryService systemIdentityQueryService = new OkrSystemIdentityQueryService(); - /** - * 在系统中分析所有的不正常身份，并且统计到数据库中 - * @throws Exception - */ - public void checkAllAbnormalIdentityInSystem() throws Exception { - logger.info("系统开始尝试分析不正常的系统身份以及所涉及的信息......" ); - String flag = new DateOperation().getNowTimeChar(); - - List identities_ok = new ArrayList<>(); - List identities_error = new ArrayList<>(); - - checkIdentityInWork( identities_ok, identities_error ); - checkIdentityInReport( identities_ok, identities_error ); - checkIdentityInDynamics( identities_ok, identities_error ); - checkIdentityInTask( identities_ok, identities_error ); - checkIdentityInConfig( identities_ok, identities_error ); - checkIdentityInStatistic( identities_ok, identities_error ); - - int number = 0; - int total = identities_error.size(); - - //处理所有的非正常人员身份信息，查询所有的人员涉及到的信息列表，并且存储为JSON - for( String identity : identities_error ){ - number++; - logger.info("正在汇总不正常的系统身份("+number+"/"+total+")[" + identity + "]所涉及的信息......" ); - //查询该身份所有涉及的数据信息列表 - String content = null; - List errorRecordsList = new ArrayList<>(); - ErrorIdentityRecords errorRecords = null; - try { - errorRecords = getErrorRecordsInWork( identity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInReport( identity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInDynamics( identity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInTask( identity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInConfig( identity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - } - } catch (Exception e1) { - e1.printStackTrace(); - } - - try { - errorRecords = getErrorRecordsInStatistic( identity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - } - } catch (Exception e1) { - e1.printStackTrace(); - } - - Gson gson = XGsonBuilder.instance(); - if( errorRecordsList != null && !errorRecordsList.isEmpty() ){ - content = gson.toJson( errorRecordsList ); - }else{ - content = "{}"; - } - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - - OkrErrorSystemIdentityInfo okrErrorSystemIdentityInfo = null; - OkrErrorIdentityRecords okrErrorIdentityRecords = null; - List errorSystemIdentityInfoList = null; - List errorIdentityRecordsList = null; - - Business business = new Business(emc); - - //根据identity查询指定的数据记录是否存在 - errorSystemIdentityInfoList = business.okrErrorSystemIdentityInfoFactory().listByIdentityName( identity ); - errorIdentityRecordsList = business.okrErrorSystemIdentityInfoFactory().listRecordsByIdentityName( identity ); - - emc.beginTransaction( OkrErrorSystemIdentityInfo.class ); - emc.beginTransaction( OkrErrorIdentityRecords.class ); - if( errorSystemIdentityInfoList != null && !errorSystemIdentityInfoList.isEmpty() ){ - for( int i=0; i errorSystemIdentityInfoList = null; - List errorIdentityRecordsList = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - Business business = new Business(emc); - errorSystemIdentityInfoList = business.okrErrorSystemIdentityInfoFactory().listNotFlag(flag); - errorIdentityRecordsList = business.okrErrorSystemIdentityInfoFactory().listRecordNotFlag(flag); - emc.beginTransaction( OkrErrorSystemIdentityInfo.class ); - emc.beginTransaction( OkrErrorIdentityRecords.class ); - for( OkrErrorSystemIdentityInfo okrErrorSystemIdentityInfo : errorSystemIdentityInfoList ){ - emc.remove( okrErrorSystemIdentityInfo, CheckRemoveType.all ); - } - for( OkrErrorIdentityRecords okrErrorIdentityRecords : errorIdentityRecordsList ){ - emc.remove( okrErrorIdentityRecords, CheckRemoveType.all ); - } - emc.commit(); - - }catch( Exception e ){ - e.printStackTrace(); - } - logger.info("系统开始尝试分析不正常的系统身份以及所涉及的信息执行完成。" ); - } - - public void checkAllAbnormalIdentityInSystem( String targetIdentity, String flag ) throws Exception { - logger.info("系统开始尝试分析不正常的系统身份["+targetIdentity+"]以及该身份所涉及的信息......" ); - if( flag == null || flag.isEmpty() ){ - flag = new DateOperation().getNowTimeChar(); - } - //处理所有的非正常人员身份信息，查询所有的人员涉及到的信息列表，并且存储为JSON - //查询该身份所有涉及的数据信息列表 - String content = null; - Boolean hasErrorRecords = false; - List errorRecordsList = new ArrayList<>(); - ErrorIdentityRecords errorRecords = null; - try { - errorRecords = getErrorRecordsInWork( targetIdentity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - if( errorRecords.getErrorRecords() != null && !errorRecords.getErrorRecords().isEmpty() ){ - hasErrorRecords = true; - } - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInReport( targetIdentity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - if( errorRecords.getErrorRecords() != null && !errorRecords.getErrorRecords().isEmpty() ){ - hasErrorRecords = true; - } - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInDynamics( targetIdentity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - if( errorRecords.getErrorRecords() != null && !errorRecords.getErrorRecords().isEmpty() ){ - hasErrorRecords = true; - } - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInTask( targetIdentity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - if( errorRecords.getErrorRecords() != null && !errorRecords.getErrorRecords().isEmpty() ){ - hasErrorRecords = true; - } - } - } catch (Exception e1) { - e1.printStackTrace(); - } - try { - errorRecords = getErrorRecordsInConfig( targetIdentity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - if( errorRecords.getErrorRecords() != null && !errorRecords.getErrorRecords().isEmpty() ){ - hasErrorRecords = true; - } - } - } catch (Exception e1) { - e1.printStackTrace(); - } - - try { - errorRecords = getErrorRecordsInStatistic( targetIdentity ); - if ( errorRecords != null ){ - errorRecordsList.add( errorRecords ); - if( errorRecords.getErrorRecords() != null && !errorRecords.getErrorRecords().isEmpty() ){ - hasErrorRecords = true; - } - } - } catch (Exception e1) { - e1.printStackTrace(); - } - - Gson gson = XGsonBuilder.instance(); - if( errorRecordsList != null && !errorRecordsList.isEmpty() ){ - content = gson.toJson( errorRecordsList ); - }else{ - content = "{}"; - } - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - OkrErrorSystemIdentityInfo okrErrorSystemIdentityInfo = null; - OkrErrorIdentityRecords okrErrorIdentityRecords = null; - List errorSystemIdentityInfoList = null; - List errorIdentityRecordsList = null; - Business business = new Business(emc); - //根据identity查询指定的数据记录是否存在 - errorSystemIdentityInfoList = business.okrErrorSystemIdentityInfoFactory().listByIdentityName( targetIdentity ); - errorIdentityRecordsList = business.okrErrorSystemIdentityInfoFactory().listRecordsByIdentityName( targetIdentity ); - - emc.beginTransaction( OkrErrorSystemIdentityInfo.class ); - emc.beginTransaction( OkrErrorIdentityRecords.class ); - if( errorSystemIdentityInfoList != null && !errorSystemIdentityInfoList.isEmpty() ){ - for( int i=0; i < errorSystemIdentityInfoList.size(); i++ ){ - if( i == 0 ){ - okrErrorSystemIdentityInfo = errorSystemIdentityInfoList.get( i ); - }else{ - emc.remove( errorSystemIdentityInfoList.get( i ), CheckRemoveType.all ); - } - } - } - - if( errorIdentityRecordsList != null && !errorIdentityRecordsList.isEmpty() ){ - for( int i=0; i errorIdentityRecordList = new ArrayList<>(); - - // OKR_STATISTIC_REPORT_CONTENT - List statisticReportContentRecords = systemIdentityQueryService.listErrorIdentitiesInStReportContent( identity, "all" ); - for( OkrStatisticReportContent okrStatisticReportContent : statisticReportContentRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrStatisticReportContent.getId(), identity, "OKR_STATISTIC_REPORT_CONTENT", okrStatisticReportContent.getWorkTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_STATISTIC_REPORT_STATUS - List statisticReportStatusRecords = systemIdentityQueryService.listErrorIdentitiesInStReportStatus( identity, "all" ); - for( OkrStatisticReportStatus okrStatisticReportStatus : statisticReportStatusRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrStatisticReportStatus.getId(), identity, "OKR_STATISTIC_REPORT_STATUS", okrStatisticReportStatus.getWorkTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - - ErrorIdentityRecords errorIdentityRecords = new ErrorIdentityRecords(); - errorIdentityRecords.setIdentity(identity); - errorIdentityRecords.setRecordType( "数据统计" ); - errorIdentityRecords.setErrorRecords( errorIdentityRecordList ); - return errorIdentityRecords; - } - - /** - * TODO:从系统配置信息中获取跟非正常身份有关的信息记录 - * - * OKR_CONFIG_SECRETARY - * OKR_CONFIG_SYSTEM - * - * @param identity - * @return - * @throws Exception - */ - private ErrorIdentityRecords getErrorRecordsInConfig(String identity) throws Exception { - Date now = new Date(); - ErrorIdentityRecord errorIdentityRecord = null; - List errorIdentityRecordList = new ArrayList<>(); - - // OKR_CONFIG_SECRETARY - List configSecretaryRecords = systemIdentityQueryService.listErrorIdentitiesInConfigSecretary( identity, "all" ); - for( OkrConfigSecretary okrConfigSecretary : configSecretaryRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrConfigSecretary.getId(), identity, "OKR_CONFIG_SECRETARY", okrConfigSecretary.getSecretaryIdentity() + "代理领导：" + okrConfigSecretary.getLeaderIdentity(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_CONFIG_SYSTEM - List configSystemRecords = systemIdentityQueryService.listErrorIdentitiesInConfigSystem( identity, "all" ); - for( OkrConfigSystem okrConfigSystem : configSystemRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrConfigSystem.getId(), identity, "OKR_CONFIG_SYSTEM", okrConfigSystem.getConfigValue(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - - ErrorIdentityRecords errorIdentityRecords = new ErrorIdentityRecords(); - errorIdentityRecords.setIdentity(identity); - errorIdentityRecords.setRecordType( "系统配置" ); - errorIdentityRecords.setErrorRecords( errorIdentityRecordList ); - return errorIdentityRecords; - } - - /** - * TODO:从工作待办已办信息中获取跟非正常身份有关的信息记录 - * - * OKR_TASK - * OKR_TASKHANDLED - * - * @param identity - * @return - * @throws Exception - */ - private ErrorIdentityRecords getErrorRecordsInTask(String identity) throws Exception { - Date now = new Date(); - ErrorIdentityRecord errorIdentityRecord = null; - List errorIdentityRecordList = new ArrayList<>(); - - // OKR_TASK - List taskRecords = systemIdentityQueryService.listErrorIdentitiesInTask( identity, "all" ); - for( OkrTask okrTask : taskRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrTask.getId(), identity, "OKR_TASK", okrTask.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_TASKHANDLED - List taskHandledRecords = systemIdentityQueryService.listErrorIdentitiesInTaskhandled( identity, "all" ); - for( OkrTaskHandled okrTaskHandled : taskHandledRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrTaskHandled.getId(), identity, "OKR_TASKHANDLED", okrTaskHandled.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - - ErrorIdentityRecords errorIdentityRecords = new ErrorIdentityRecords(); - errorIdentityRecords.setIdentity(identity); - errorIdentityRecords.setRecordType( "待办已办" ); - errorIdentityRecords.setErrorRecords( errorIdentityRecordList ); - return errorIdentityRecords; - } - - /** - * TODO:从工作交流动态信息中获取跟非正常身份有关的信息记录 - * - * OKR_WORKCHAT - * OKR_WORKDYNAMICS - * - * @param identity - * @return - * @throws Exception - */ - private ErrorIdentityRecords getErrorRecordsInDynamics(String identity) throws Exception { - Date now = new Date(); - ErrorIdentityRecord errorIdentityRecord = null; - List errorIdentityRecordList = new ArrayList<>(); - - // OKR_WORKCHAT - List workChatRecords = systemIdentityQueryService.listErrorIdentitiesInWorkChat( identity, "all" ); - for( OkrWorkChat okrWorkChat : workChatRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrWorkChat.getId(), identity, "OKR_WORKCHAT", okrWorkChat.getWorkTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_WORKDYNAMICS -// List workDynamicsRecords = systemIdentityQueryService.listErrorIdentitiesInDynamics( identity, "all" ); -// for( OkrWorkDynamics workDynamics : workDynamicsRecords ){ -// errorIdentityRecord = new ErrorIdentityRecord( workDynamics.getId(), identity, "OKR_WORKDYNAMICS", workDynamics.getDynamicObjectTitle(), now ); -// errorIdentityRecordList.add( errorIdentityRecord ); -// } - - ErrorIdentityRecords errorIdentityRecords = new ErrorIdentityRecords(); - errorIdentityRecords.setIdentity(identity); - errorIdentityRecords.setRecordType( "交流动态" ); - errorIdentityRecords.setErrorRecords( errorIdentityRecordList ); - return errorIdentityRecords; - } - - /** - * TODO:从工作汇报信息中获取跟非正常身份有关的信息记录 - * - * OKR_WORK_REPORTBASEINFO - * OKR_WORK_REPORT_PERSONLINK - * OKR_WORK_REPORT_PROCESSLOG - * - * @param identity - * @return - * @throws Exception - */ - private ErrorIdentityRecords getErrorRecordsInReport(String identity) throws Exception { - Date now = new Date(); - ErrorIdentityRecord errorIdentityRecord = null; - List errorIdentityRecordList = new ArrayList<>(); - - // OKR_WORK_REPORTBASEINFO - List reportInfoRecords = systemIdentityQueryService.listErrorIdentitiesInReportBaseInfo( identity, "all" ); - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : reportInfoRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrWorkReportBaseInfo.getId(), identity, "OKR_WORK_REPORTBASEINFO", okrWorkReportBaseInfo.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_WORK_REPORT_PERSONLINK - List workReportPersonLinkRecords = systemIdentityQueryService.listErrorIdentitiesInReportPersonInfo( identity, "all" ); - for( OkrWorkReportPersonLink okrWorkReportPersonLink : workReportPersonLinkRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrWorkReportPersonLink.getId(), identity, "OKR_WORK_REPORT_PERSONLINK", okrWorkReportPersonLink.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_WORK_REPORT_PROCESSLOG 处理日志不检查 -// List workReportProcessLogRecords = systemIdentityQueryService.listErrorIdentitiesInReportProcessLog( identity ); -// for( OkrWorkReportProcessLog okrWorkReportProcessLog : workReportProcessLogRecords ){ -// errorIdentityRecord = new ErrorIdentityRecord( okrWorkReportProcessLog.getId(), identity, "OKR_WORK_REPORT_PROCESSLOG", okrWorkReportProcessLog.getTitle(), now ); -// errorIdentityRecordList.add( errorIdentityRecord ); -// } - - ErrorIdentityRecords errorIdentityRecords = new ErrorIdentityRecords(); - errorIdentityRecords.setIdentity(identity); - errorIdentityRecords.setRecordType( "工作汇报" ); - errorIdentityRecords.setErrorRecords( errorIdentityRecordList ); - return errorIdentityRecords; - } - - /** - * TODO:从工作信息中获取跟非正常身份有关的信息记录 - * - * OKR_CENTERWORKINFO - * OKR_WORKBASEINFO - * OKR_WORK_AUTHORIZE_RECORD - * OKR_WORK_PERSON - * - * @param identity - * @return - * @throws Exception - */ - private ErrorIdentityRecords getErrorRecordsInWork( String identity ) throws Exception { - Date now = new Date(); - ErrorIdentityRecord errorIdentityRecord = null; - List errorIdentityRecordList = new ArrayList<>(); - - // OKR_CENTERWORKINFO - List centerRecords = systemIdentityQueryService.listErrorIdentitiesInCenterInfo( identity, "all" ); - for( OkrCenterWorkInfo okrCenterWorkInfo : centerRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrCenterWorkInfo.getId(), identity, "OKR_CENTERWORKINFO", okrCenterWorkInfo.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_WORKBASEINFO - List workBaseRecords = systemIdentityQueryService.listErrorIdentitiesInWorkBaseInfo( identity, "all" ); - for( OkrWorkBaseInfo okrWorkBaseInfo : workBaseRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( okrWorkBaseInfo.getId(), identity, "OKR_WORKBASEINFO", okrWorkBaseInfo.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_WORK_AUTHORIZE_RECORD - List workAuthorizeRecords = systemIdentityQueryService.listErrorIdentitiesInAuthorizeRecord( identity, "all" ); - for( OkrWorkAuthorizeRecord workAuthorizeRecord : workAuthorizeRecords ){ - errorIdentityRecord = new ErrorIdentityRecord( workAuthorizeRecord.getId(), identity, "OKR_WORK_AUTHORIZE_RECORD", workAuthorizeRecord.getTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - // OKR_WORK_PERSON - List workPersons = systemIdentityQueryService.listErrorIdentitiesInWorkPerson( identity, "all" ); - for( OkrWorkPerson workPerson : workPersons ){ - errorIdentityRecord = new ErrorIdentityRecord( workPerson.getId(), identity, "OKR_WORK_PERSON", workPerson.getProcessIdentity() + ":" + workPerson.getWorkTitle(), now ); - errorIdentityRecordList.add( errorIdentityRecord ); - } - - ErrorIdentityRecords errorIdentityRecords = new ErrorIdentityRecords(); - errorIdentityRecords.setIdentity(identity); - errorIdentityRecords.setRecordType( "工作信息" ); - errorIdentityRecords.setErrorRecords( errorIdentityRecordList ); - return errorIdentityRecords; - } - - /** - * TODO:检查统计信息中所有的身份信息 - * - * OKR_STATISTIC_REPORT_CONTENT - * OKR_STATISTIC_REPORT_STATUS - * - * @return - * @throws Exception - */ - private void checkIdentityInStatistic(List identities_ok, List identities_error) throws Exception { - List identities = null; - //OKR_STATISTIC_REPORT_CONTENT - identities = systemIdentityQueryService.listIdentitiesInStReportContent( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_STATISTIC_REPORT_STATUS - identities = systemIdentityQueryService.listIdentitiesInStReportStatus( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - } - - /** - * TODO:检查配置信息中所有的身份信息 - * - * OKR_CONFIG_SECRETARY - * OKR_CONFIG_SYSTEM - * - * @return - * @throws Exception - */ - private void checkIdentityInConfig(List identities_ok, List identities_error) throws Exception { - List identities = null; - //OKR_CONFIG_SECRETARY - identities = systemIdentityQueryService.listIdentitiesInSecretaryConfig( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_CONFIG_SYSTEM - identities = systemIdentityQueryService.listIdentitiesInSystemConfig( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - } - - /** - * TODO:检查待办已办信息中所有的身份信息 - * - * OKR_TASK - * OKR_TASKHANDLED - * - * @return - * @throws Exception - */ - private void checkIdentityInTask(List identities_ok, List identities_error) throws Exception { - List identities = null; - //OKR_TASK - identities = systemIdentityQueryService.listIdentitiesInTask( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_TASKHANDLED - identities = systemIdentityQueryService.listIdentitiesInTaskHandled( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - } - - /** - * TODO:检查交流动态信息中所有的身份信息 - * - * OKR_WORKCHAT - * OKR_WORKDYNAMICS - * - * @return - * @throws Exception - */ - private void checkIdentityInDynamics(List identities_ok, List identities_error) throws Exception { - List identities = null; - //OKR_WORKCHAT - identities = systemIdentityQueryService.listIdentitiesInWorkChat( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_WORKDYNAMICS -// identities = systemIdentityQueryService.listIdentitiesInWorkDynamics( identities_ok, identities_error ); -// systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - } - - /** - * TODO:检查工作信息中所有的身份信息 - * - * OKR_CENTERWORKINFO - * OKR_WORKBASEINFO - * OKR_WORK_AUTHORIZE_RECORD - * OKR_WORK_PERSON - * - * @param identities_ok - * @param identities_error - * @throws Exception - */ - private void checkIdentityInWork( List identities_ok, List identities_error ) throws Exception { - List identities = null; - //OKR_CENTERWORKINFO - identities = listIdentitiesInCenterInfo( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_WORKBASEINFO - identities = listIdentitiesInWorkBaseInfo( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_WORK_AUTHORIZE_RECORD - identities = systemIdentityQueryService.listIdentitiesInWorkAuthorizeRecord( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_WORK_PERSON - identities = systemIdentityQueryService.listIdentitiesInWorkPerson( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - } - - /** - * TODO:查询表OKR_WORKBASEINFO中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - private List listIdentitiesInWorkBaseInfo(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //cooperateIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctCooperateIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //creatorIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctCreatorIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //deployerIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctDeployerIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //reportLeaderIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctReportLeaderIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //responsibilityIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctResponsibilityIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * 查询表OKR_CENTERWORKINFO中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - private List listIdentitiesInCenterInfo( List identities_ok, List identities_error ) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //auditLeaderIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctAuditLeaderIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //creatorIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctCreatorIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //deployerIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctDeployerIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - //reportAuditLeaderIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctReportAuditLeaderIdentity( identities_ok, identities_error ); - result = systemIdentityQueryService.addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:检查汇报信息中所有的身份信息 - * - * OKR_WORK_REPORTBASEINFO - * OKR_WORK_REPORT_PERSONLINK - * OKR_WORK_REPORT_PROCESSLOG - * - * @return - * @throws Exception - */ - private void checkIdentityInReport( List identities_ok, List identities_error ) throws Exception { - List identities = null; - //OKR_WORK_REPORTBASEINFO - identities = systemIdentityQueryService.listIdentitiesInReportBaseInfo( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_WORK_REPORT_PERSONLINK - identities = systemIdentityQueryService.listIdentitiesInReportPersonInfo( identities_ok, identities_error ); - systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - //OKR_WORK_REPORT_PROCESSLOG -// identities = systemIdentityQueryService.listIdentitiesInReportProcessLog( identities_ok, identities_error ); -// systemIdentityQueryService.checkIdentities( identities, identities_ok, identities_error ); - } - - /** - * 将所有的数据中相关的身份修改为指定的身份，并且修改相应的姓名，组织以及顶层组织信息，如果需要的话 - * - * @param fromIdentityName - * @param toIdentityName - * @param recordType 数据类别 - * @param tableName 数据表名 - * @param recordId 数据记录ID - * - * @return - * @throws Exception - */ - public Boolean changeUserIdentity( String fromIdentityName, String toIdentityName, String recordType, String tableName, String recordId ) throws Exception{ - logger.info( "系统尝试将所有的数据中涉及["+fromIdentityName+"]修改为["+toIdentityName+"]......" ); - if( fromIdentityName == null ){ - throw new Exception("fromIdentityName 不允许为空！"); - } - if( toIdentityName == null ){ - throw new Exception("toIdentityName 不允许为空！"); - } - Boolean check = true; - Boolean isSameUser = false; - OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - String personName = okrUserManagerService.getPersonNameByIdentity( toIdentityName ); - - OkrUserCache toUserCache = new OkrUserCache(); - toUserCache.setLoginUserName( personName ); - toUserCache.setLoginIdentityName( toIdentityName ); - toUserCache.setLoginUserUnitName( okrUserManagerService.getUnitNameByIdentity( toIdentityName ) ); - toUserCache.setLoginUserTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( toIdentityName ) ); - - //判断是不是由于组织调整导致身份无效，如果是同一个人，那么是所有记录的身份都可以转过来的，除了处理日志 - //如果不是同一个人，那么部分身份是不应该转到新的员工身份的，如已办 - if( fromIdentityName.split("\\(") != null && fromIdentityName.split("\\(").length > 0 && fromIdentityName.split("\\(")[0].trim().equalsIgnoreCase( personName )){ - isSameUser = true; - } - - //处理所有fromIdentityName涉及的数据信息 - if( check ){ - if( "工作信息".equals( recordType ) || "all".equalsIgnoreCase( recordType )){ - try { - logger.info("系统正在修改工作信息相关数据：将["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]"); - check = changeUserIdentityInWork( fromIdentityName, toUserCache, isSameUser, tableName, recordId ); - } catch (Exception e ) { - e.printStackTrace(); - } - } - } - if( check ){ - if( "工作汇报".equals( recordType ) || "all".equalsIgnoreCase( recordType )){ - try { - logger.info("系统正在修改工作汇报相关数据：将["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]"); - check = changeUserIdentityInReport( fromIdentityName, toUserCache, isSameUser, tableName, recordId ); - } catch (Exception e ) { - e.printStackTrace(); - } - } - } - if( check ){ - if( "交流动态".equals( recordType ) || "all".equalsIgnoreCase( recordType )){ - try { - logger.info("系统正在修改交流动态相关数据：将["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]"); - check = changeUserIdentityInDynamics( fromIdentityName, toUserCache, isSameUser, tableName, recordId ); - } catch (Exception e ) { - e.printStackTrace(); - } - } - } - if( check ){ - if( "待办已办".equals( recordType ) || "all".equalsIgnoreCase( recordType )){ - try { - logger.info("系统正在修改待办已办相关数据：将["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]"); - check = changeUserIdentityInTask( fromIdentityName, toUserCache, isSameUser, tableName, recordId ); - } catch (Exception e ) { - e.printStackTrace(); - } - } - } - if( check ){ - if( "系统配置".equals( recordType ) || "all".equalsIgnoreCase( recordType )){ - try { - logger.info("系统正在修改系统配置相关数据：将["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]"); - check = changeUserIdentityInConfig( fromIdentityName, toUserCache, isSameUser, tableName, recordId ); - } catch (Exception e ) { - e.printStackTrace(); - } - } - } - if( check ){ - if( "数据统计".equals( recordType ) || "all".equalsIgnoreCase( recordType )){ - try { - logger.info("系统正在修改统计数据相关数据：将["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]"); - check = changeUserIdentityInStatistic( fromIdentityName, toUserCache, isSameUser, tableName, recordId ); - } catch (Exception e ) { - e.printStackTrace(); - } - } - } - logger.info( "将系统中所有的数据中涉及["+fromIdentityName+"]修改为["+toUserCache.getLoginIdentityName()+"]处理完成。" ); - return true; - } - /** - * TODO:修改数据表中交流和动态相关的信息

- * - * 涉及数据表：
OKR_STATISTIC_REPORT_CONTENT,OKR_STATISTIC_REPORT_STATUS - * - * @param fromIdentityName - * @param isSameUser - * @param recordId - * @param tableName - * @param okrUserCache - * @return - * @throws Exception - */ - private Boolean changeUserIdentityInStatistic(String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser, String tableName, String recordId) throws Exception { - // OKR_STATISTIC_REPORT_CONTENT - if( "all".equalsIgnoreCase( tableName ) || "OKR_STATISTIC_REPORT_CONTENT".equalsIgnoreCase( tableName )){ - List statisticReportContentRecords = systemIdentityQueryService.listErrorIdentitiesInStReportContent( fromIdentityName, recordId ); - if( statisticReportContentRecords != null && !statisticReportContentRecords.isEmpty() ){ - for( OkrStatisticReportContent okrStatisticReportContent : statisticReportContentRecords ){ - systemIdentityQueryService.changeUserIdentityInStReportContent( okrStatisticReportContent.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_STATISTIC_REPORT_STATUS - if( "all".equalsIgnoreCase( tableName ) || "OKR_STATISTIC_REPORT_STATUS".equalsIgnoreCase( tableName )){ - List statisticReportStatusRecords = systemIdentityQueryService.listErrorIdentitiesInStReportStatus( fromIdentityName, recordId ); - if( statisticReportStatusRecords != null && !statisticReportStatusRecords.isEmpty() ){ - for( OkrStatisticReportStatus okrStatisticReportStatus : statisticReportStatusRecords ){ - systemIdentityQueryService.changeUserIdentityInStReportStatus( okrStatisticReportStatus.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - - return true; - } - /** - * TODO:修改数据表中交流和动态相关的信息

- * - * 涉及数据表：
OKR_CONFIG_SECRETARY,OKR_CONFIG_SYSTEM - * - * @param fromIdentityName - * @param isSameUser - * @param recordId - * @param tableName - * @param okrUserCache - * @return - * @throws Exception - */ - private Boolean changeUserIdentityInConfig( String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser, String tableName, String recordId ) throws Exception { - // OKR_CONFIG_SECRETARY - if( "all".equalsIgnoreCase( tableName ) || "OKR_CONFIG_SECRETARY".equalsIgnoreCase( tableName )){ - List configSecretaryRecords = systemIdentityQueryService.listErrorIdentitiesInConfigSecretary( fromIdentityName, recordId ); - if( configSecretaryRecords != null && !configSecretaryRecords.isEmpty() ){ - for( OkrConfigSecretary okrConfigSecretary : configSecretaryRecords ){ - systemIdentityQueryService.changeUserIdentityInConfigSecretary( okrConfigSecretary.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_CONFIG_SYSTEM - if( "all".equalsIgnoreCase( tableName ) || "OKR_CONFIG_SYSTEM".equalsIgnoreCase( tableName )){ - List configSystemRecords = systemIdentityQueryService.listErrorIdentitiesInConfigSystem( fromIdentityName, recordId ); - if( configSystemRecords != null && !configSystemRecords.isEmpty() ){ - for( OkrConfigSystem okrConfigSystem : configSystemRecords ){ - systemIdentityQueryService.changeUserIdentityInConfigSystem( okrConfigSystem.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - - } - return true; - } - /** - * TODO:修改数据表中交流和动态相关的信息

- * - * 涉及数据表：
OKR_TASK,OKR_TASKHANDLED - * - * @param fromIdentityName - * @param isSameUser - * @param recordId - * @param tableName - * @param okrUserCache - * @return - * @throws Exception - */ - private Boolean changeUserIdentityInTask( String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser, String tableName, String recordId ) throws Exception { - // OKR_TASK - if( "all".equalsIgnoreCase( tableName ) || "OKR_TASK".equalsIgnoreCase( tableName )){ - List taskRecords = systemIdentityQueryService.listErrorIdentitiesInTask( fromIdentityName, recordId ); - if( taskRecords != null && !taskRecords.isEmpty() ){ - for( OkrTask okrTask : taskRecords ){ - systemIdentityQueryService.changeUserIdentityInTask( okrTask.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - - } - // OKR_TASKHANDLED - if( "all".equalsIgnoreCase( tableName ) || "OKR_TASKHANDLED".equalsIgnoreCase( tableName )){ - List taskHandledRecords = systemIdentityQueryService.listErrorIdentitiesInTaskhandled( fromIdentityName, recordId ); - if( taskHandledRecords != null && !taskHandledRecords.isEmpty() ){ - for( OkrTaskHandled okrTaskHandled : taskHandledRecords ){ - systemIdentityQueryService.changeUserIdentityInTaskhandled( okrTaskHandled.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - return true; - } - /** - * TODO:修改数据表中交流和动态相关的信息

- * - * 涉及数据表：
OKR_WORKCHAT,OKR_WORKDYNAMICS - * - * @param fromIdentityName - * @param isSameUser - * @param okrUserCache - * @return - * @throws Exception - */ - private Boolean changeUserIdentityInDynamics( String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser, String tableName, String recordId ) throws Exception { - // OKR_WORKCHAT - if( "all".equalsIgnoreCase( tableName ) || "OKR_WORKCHAT".equalsIgnoreCase( tableName )){ - List workChatRecords = systemIdentityQueryService.listErrorIdentitiesInWorkChat( fromIdentityName, recordId ); - if( workChatRecords != null && !workChatRecords.isEmpty() ){ - for( OkrWorkChat okrWorkChat : workChatRecords ){ - systemIdentityQueryService.changeUserIdentityInWorkChat( okrWorkChat.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_WORKDYNAMICS -// List workDynamicsRecords = systemIdentityQueryService.listErrorIdentitiesInDynamics( fromIdentityName ); -// for( OkrWorkDynamics okrWorkDynamics : workDynamicsRecords ){ -// systemIdentityQueryService.changeUserIdentityInDynamics( okrWorkDynamics.getId(), fromIdentityName, toUserCache, isSameUser ); -// } - return true; - } - - /** - * TODO:修改数据表中汇报相关的信息

- * - * 涉及数据表：
OKR_WORK_REPORTBASEINFO,OKR_WORK_REPORT_PERSONLINK,OKR_WORK_REPORT_PROCESSLOG - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * @param tableName - * @param recordId - * @return - * @throws Exception - */ - private Boolean changeUserIdentityInReport(String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser, String tableName, String recordId) throws Exception { - // OKR_WORK_REPORTBASEINFO - if( "all".equalsIgnoreCase( tableName ) || "OKR_WORK_REPORTBASEINFO".equalsIgnoreCase( tableName )){ - List reportInfoRecords = systemIdentityQueryService.listErrorIdentitiesInReportBaseInfo( fromIdentityName, recordId ); - if( reportInfoRecords != null && !reportInfoRecords.isEmpty() ){ - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : reportInfoRecords ){ - systemIdentityQueryService.changeUserIdentityInReportBaseInfo( okrWorkReportBaseInfo.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_WORK_REPORT_PERSONLINK - if( "all".equalsIgnoreCase( tableName ) || "OKR_WORK_REPORT_PERSONLINK".equalsIgnoreCase( tableName )){ - List workReportPersonLinkRecords = systemIdentityQueryService.listErrorIdentitiesInReportPersonInfo( fromIdentityName, recordId ); - if( workReportPersonLinkRecords != null && !workReportPersonLinkRecords.isEmpty() ){ - for( OkrWorkReportPersonLink okrWorkReportPersonLink : workReportPersonLinkRecords ){ - systemIdentityQueryService.changeUserIdentityInReportPersonLink( okrWorkReportPersonLink.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - - // OKR_WORK_REPORT_PROCESSLOG 处理日志不用修改 -// List workReportProcessLogRecords = systemIdentityQueryService.listErrorIdentitiesInReportProcessLog( fromIdentityName ); -// for( OkrWorkReportProcessLog okrWorkReportProcessLog : workReportProcessLogRecords ){ -// systemIdentityQueryService.changeUserIdentityInReportProcessLog( okrWorkReportProcessLog.getId(), fromIdentityName, toUserCache, isSameUser ); -// } - return true; - } - - /** - * TODO:修改数据表中工作相关的信息

- * - * 涉及数据表：
OKR_CENTERWORKINFO,OKR_WORKBASEINFO,OKR_WORK_AUTHORIZE_RECORD,OKR_WORK_PERSON - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * @param tableName - * @param recordId - * @return - * @throws Exception - */ - private Boolean changeUserIdentityInWork(String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser, String tableName, String recordId ) throws Exception { - // OKR_CENTERWORKINFO - if( "all".equalsIgnoreCase( tableName ) || "OKR_CENTERWORKINFO".equalsIgnoreCase( tableName )){ - List centerRecords = systemIdentityQueryService.listErrorIdentitiesInCenterInfo( fromIdentityName, recordId ); - if( centerRecords != null && !centerRecords.isEmpty() ){ - for( OkrCenterWorkInfo okrCenterWorkInfo : centerRecords ){ - systemIdentityQueryService.changeUserIdentityInCenterInfo( okrCenterWorkInfo.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_WORKBASEINFO - if( "all".equalsIgnoreCase( tableName ) || "OKR_WORKBASEINFO".equalsIgnoreCase( tableName )){ - List workBaseRecords = systemIdentityQueryService.listErrorIdentitiesInWorkBaseInfo( fromIdentityName, recordId ); - if( workBaseRecords != null && !workBaseRecords.isEmpty() ){ - for( OkrWorkBaseInfo okrWorkBaseInfo : workBaseRecords ){ - systemIdentityQueryService.changeUserIdentityInWorkBaseInfo( okrWorkBaseInfo.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_WORK_AUTHORIZE_RECORD - if( "all".equalsIgnoreCase( tableName ) || "OKR_WORK_AUTHORIZE_RECORD".equalsIgnoreCase( tableName )){ - List workAuthorizeRecords = systemIdentityQueryService.listErrorIdentitiesInAuthorizeRecord( fromIdentityName, recordId ); - if( workAuthorizeRecords != null && !workAuthorizeRecords.isEmpty() ){ - for( OkrWorkAuthorizeRecord okrWorkAuthorizeRecord : workAuthorizeRecords ){ - systemIdentityQueryService.changeUserIdentityInAuthorizeRecord( okrWorkAuthorizeRecord.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - // OKR_WORK_PERSON - if( "all".equalsIgnoreCase( tableName ) || "OKR_WORK_AUTHORIZE_RECORD".equalsIgnoreCase( tableName )){ - List workPersons = systemIdentityQueryService.listErrorIdentitiesInWorkPerson( fromIdentityName, recordId ); - if( workPersons != null && !workPersons.isEmpty() ){ - for( OkrWorkPerson okrWorkPerson : workPersons ){ - systemIdentityQueryService.changeUserIdentityInWorkPerson( okrWorkPerson.getId(), fromIdentityName, toUserCache, isSameUser ); - } - } - } - return true; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityQueryService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityQueryService.java deleted file mode 100644 index 78b297e3f6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrSystemIdentityQueryService.java +++ /dev/null @@ -1,1627 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.OkrUserCache; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrConfigSecretary; -import com.x.okr.entity.OkrConfigSystem; -import com.x.okr.entity.OkrErrorIdentityRecords; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -/** - * 全系统范围内处理人员身份问题 - * 1、全系统身份替换功能 - 2、无效身份检查功能 - 1)无效身份涉及的数据展现出来 - 2)无效身份的替换 - * - */ -public class OkrSystemIdentityQueryService { - - private OkrUserManagerService userManagerService = new OkrUserManagerService(); - private static Logger logger = LoggerFactory.getLogger( OkrSystemIdentityQueryService.class ); - - /** - * 根据身份名称，从工作最新汇报情况统计信息中查询与该身份有关的所有信息列表 - * - * OKR_STATISTIC_REPORT_CONTENT - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInStReportStatus(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrStatisticReportStatusFactory().listErrorIdentitiesInStReportStatus( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - /** - * 根据身份名称，从工作汇报状态统计信息中查询与该身份有关的所有信息列表 - * - * OKR_STATISTIC_REPORT_STATUS - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInStReportContent(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrStatisticReportContentFactory().listErrorIdentitiesInStReportContent( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从系统参数配置信息中查询与该身份有关的所有信息列表 - * - * OKR_CONFIG_SYSTEM - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInConfigSystem(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrConfigSystemFactory().listErrorIdentitiesInConfigSystem( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - /** - * 根据身份名称，从领导秘书配置信息中查询与该身份有关的所有信息列表 - * - * OKR_CONFIG_SECRETARY - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInConfigSecretary(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrConfigSecretaryFactory().listErrorIdentitiesInConfigSecretary( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从工作已办已阅信息中查询与该身份有关的所有信息列表 - * - * OKR_TASKHANDLED - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInTaskhandled(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrTaskHandledFactory().listErrorIdentitiesInTaskhandled( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - /** - * 根据身份名称，从工作待办待阅信息中查询与该身份有关的所有信息列表 - * - * OKR_TASK - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInTask(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrTaskFactory().listErrorIdentitiesInWorkTask( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从工作操作动态信息中查询与该身份有关的所有信息列表 - * - * OKR_WORKDYNAMICS - * - * @param identity - * @return - * @throws Exception - */ - public List listErrorIdentitiesInDynamics(String identity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkDynamicsFactory().listErrorIdentitiesInDynamics( identity ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从工作交流信息中查询与该身份有关的所有信息列表 - * - * OKR_WORKCHAT - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkChat(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkChatFactory().listErrorIdentitiesInWorkChat( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - - /** - * 根据身份名称，从工作汇报信息处理日志中查询与该身份有关的所有信息列表 - * - * OKR_WORK_REPORT_PROCESSLOG - * - * @param identity - * @return - * @throws Exception - */ - public List listErrorIdentitiesInReportProcessLog(String identity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkReportProcessLogFactory().listErrorIdentitiesInReportProcessLog( identity ); - }catch( Exception e ){ - throw e; - } - } - /** - * 根据身份名称，从工作汇报处理者信息中查询与该身份有关的所有信息列表 - * - * OKR_WORK_REPORT_PERSONLINK - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInReportPersonInfo(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkReportPersonLinkFactory().listErrorIdentitiesInReportPersonInfo( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - /** - * 根据身份名称，从工作汇报信息中查询与该身份有关的所有信息列表 - * - * OKR_WORK_REPORTBASEINFO - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInReportBaseInfo(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().listErrorIdentitiesInReportBaseInfo( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - - /** - * 根据身份名称，从工作授权信息中查询与该身份有关的所有信息列表 - * - * OKR_WORK_PERSON - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkPerson(String identity, String recordId ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkPersonFactory().listErrorIdentitiesInWorkPerson( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从工作授权信息中查询与该身份有关的所有信息列表 - * - * OKR_WORK_AUTHORIZE_RECORD - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInAuthorizeRecord(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().listErrorIdentitiesInAuthorizeRecord( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从具体工作信息中查询与该身份有关的所有信息列表 - * - * OKR_WORKBASEINFO - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInWorkBaseInfo(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listErrorIdentitiesInWorkBaseInfo( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据身份名称，从中心工作信息中查询与该身份有关的所有信息列表 - * - * OKR_CENTERWORKINFO - * - * @param identity - * @param recordId - * @return - * @throws Exception - */ - public List listErrorIdentitiesInCenterInfo(String identity, String recordId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrCenterWorkInfoFactory().listErrorIdentitiesInCenterInfo( identity, recordId ); - }catch( Exception e ){ - throw e; - } - } - - /** - * TODO:查询表OKR_STATISTIC_REPORT_STATUS中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInStReportStatus(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //responsibilityIdentity - identities = business.okrStatisticReportStatusFactory().listAllDistinctResponsibilityIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - /** - * TODO:查询表OKR_STATISTIC_REPORT_CONTENT中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInStReportContent(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //responsibilityIdentity - identities = business.okrStatisticReportContentFactory().listAllDistinctResponsibilityIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:检查配置信息中所有的身份信息 - * - * OKR_CONFIG_SECRETARY - * OKR_CONFIG_SYSTEM - * - * @return - * @throws Exception - */ - public void checkIdentityInConfig(List identities_ok, List identities_error) throws Exception { - List identities = null; - //OKR_CONFIG_SECRETARY - identities = listIdentitiesInSecretaryConfig( identities_ok, identities_error ); - checkIdentities( identities, identities_ok, identities_error ); - //OKR_CONFIG_SYSTEM - identities = listIdentitiesInSystemConfig( identities_ok, identities_error ); - checkIdentities( identities, identities_ok, identities_error ); - } - /** - * TODO:查询表OKR_CONFIG_SYSTEM中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInSystemConfig(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //value - identities = business.okrConfigSystemFactory().listAllDistinctValueIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - /** - * TODO:查询表OKR_CONFIG_SECRETARY中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInSecretaryConfig(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //leaderIdentity - identities = business.okrConfigSecretaryFactory().listAllDistinctLeaderIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_TASKHANDLED中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInTaskHandled(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //targetIdentity - identities = business.okrTaskHandledFactory().listAllDistinctTargetIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - /** - * TODO:查询表OKR_TASK中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInTask(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //targetIdentity - identities = business.okrTaskFactory().listAllDistinctTargetIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORKDYNAMICS中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInWorkDynamics(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //targetIdentity - identities = business.okrWorkDynamicsFactory().listAllDistinctTargetIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORKCHAT中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInWorkChat(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //senderIdentity - identities = business.okrWorkChatFactory().listAllDistinctSenderIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //targetIdentity - identities = business.okrWorkChatFactory().listAllDistinctTargetIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORK_PERSON中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInWorkPerson(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //employeeIdentity - identities = business.okrWorkPersonFactory().listAllDistinctEmployeeIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORK_AUTHORIZE_RECORD中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInWorkAuthorizeRecord(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //delegatorIdentity - identities = business.okrWorkAuthorizeRecordFactory().listAllDistinctDelegatorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //targetIdentity - identities = business.okrWorkAuthorizeRecordFactory().listAllDistinctTargetIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORKBASEINFO中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInWorkBaseInfo(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //cooperateIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctCooperateIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //creatorIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctCreatorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //deployerIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctDeployerIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //reportLeaderIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctReportLeaderIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //responsibilityIdentity - identities = business.okrWorkBaseInfoFactory().listAllDistinctResponsibilityIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * 查询表OKR_CENTERWORKINFO中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInCenterInfo( List identities_ok, List identities_error ) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //auditLeaderIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctAuditLeaderIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //creatorIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctCreatorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //deployerIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctDeployerIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //reportAuditLeaderIdentity - identities = business.okrCenterWorkInfoFactory().listAllDistinctReportAuditLeaderIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORK_REPORT_PROCESSLOG中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInReportProcessLog(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //processorIdentity - identities = business.okrWorkReportProcessLogFactory().listAllDistinctProcessorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORK_REPORT_PERSONLINK中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInReportPersonInfo(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //processorIdentity - identities = business.okrWorkReportPersonLinkFactory().listAllDistinctProcessorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:查询表OKR_WORK_REPORTBASEINFO中涉及的所有人员身份列表 - * @param identities_ok 排除已经OK的人员身份信息 - * @param identities_error 排除已经有问题的人员身份信息 - * @return - * @throws Exception - */ - public List listIdentitiesInReportBaseInfo(List identities_ok, List identities_error) throws Exception { - Business business = null; - List result = new ArrayList<>(); - List identities = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //creatorIdentity - identities = business.okrWorkReportBaseInfoFactory().listAllDistinctCreatorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //reporterIdentity - identities = business.okrWorkReportBaseInfoFactory().listAllDistinctReporterIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //currentProcessorIdentity - identities = business.okrWorkReportBaseInfoFactory().listAllDistinctCurrentProcessorIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //readleadersIdentity - identities = business.okrWorkReportBaseInfoFactory().listAllDistinctReadleadersIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - //workAdminIdentity - identities = business.okrWorkReportBaseInfoFactory().listAllDistinctWorkAdminIdentity( identities_ok, identities_error ); - result = addListToResult( identities, result ); - }catch( Exception e ){ - throw e; - } - return result; - } - - /** - * TODO:检查身份列表的身份是否正常，如果正常则加入到正常身份列表里，如果不正常则加入不正常身份列表里 - * @param identities 待检查身份列表 - * @param identities_ok 正常身份列表 - * @param identities_error 不正常身份列表 - * @throws Exception - */ - public void checkIdentities(List identities, List identities_ok, List identities_error) throws Exception { - String[] array = null; - if( identities != null && !identities.isEmpty() ){ - for( String identityString : identities ){ - if( identityString != null && !identityString.isEmpty() ){ - array = identityString.split(","); - for( String identity : array ){ - if( identity != null && !identity.isEmpty() && !identity.equalsIgnoreCase( "SYSTEM" )&& !identity.equalsIgnoreCase( "xadmin" ) ){ - if( !identities_ok.contains( identity ) ){ - if( !identities_error.contains( identity ) ){ - //检查该身份是否仍存在 - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - if( userManagerService.isIdentityExsits( identity ) == null ){ - identities_error.add( identity ); - }else{ - identities_ok.add( identity ); - } - }catch( Exception e ){ - throw e; - } - } - } - } - } - } - } - } - } - - public List addListToResult(List identities, List result) { - if( identities != null && !identities.isEmpty() ){ - if( result == null ) { - result = new ArrayList<>(); - return result; - } - - for( String identity : identities ){ - if(identity != null) { - if( !result.contains( identity) && !identity.equalsIgnoreCase( "SYSTEM" )&& !identity.equalsIgnoreCase( "xadmin" ) ){ - result.add( identity ); - }}else { - logger.info("identity=" + identity); - - } - } - } - return result; - } - - /** - * 修改表OKR_CENTERWORKINFO里的相关身份以及名称组织信息

- * ARRIBUTE: creatorIdentity，deployerIdentity，reportAuditLeaderIdentity，auditLeaderIdentity, defaultLeaderIdentity - * - * @param centerRecords - * @param fromIdentityName - * @param isSameUser - * @param okrUserCache - * @throws Exception - */ - public void changeUserIdentityInCenterInfo( String centerId, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser ) throws Exception { - if( centerId != null && fromIdentityName != null && toUserCache != null ){ - OkrCenterWorkInfo entity = null; - String personName = null; - String unitName = null; - String topUnitName = null; - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( centerId, OkrCenterWorkInfo.class ); - emc.beginTransaction( OkrCenterWorkInfo.class ); - if( entity != null ){ - //修改creatorIdentity相关的数据 - if( entity.getCreatorIdentity() != null && entity.getCreatorIdentity().equalsIgnoreCase( fromIdentityName ) ){ - entity.setCreatorName( toUserCache.getLoginUserName() ); - entity.setCreatorIdentity( toUserCache.getLoginIdentityName() ); - entity.setCreatorUnitName( toUserCache.getLoginUserUnitName() ); - entity.setCreatorTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改deployerIdentity相关的数据 - if( entity.getDeployerIdentity() != null && entity.getDeployerIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setDeployerName( toUserCache.getLoginUserName() ); - entity.setDeployerIdentity( toUserCache.getLoginIdentityName() ); - entity.setDeployerUnitName( toUserCache.getLoginUserUnitName() ); - entity.setDeployerTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改reportAuditLeaderIdentityList相关的数据, 多值 - if( ListTools.isNotEmpty( entity.getReportAuditLeaderIdentityList() ) && entity.getReportAuditLeaderIdentityList().contains(fromIdentityName) ){ - List identities = new ArrayList<>(); - List names = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - for( String identity : entity.getReportAuditLeaderIdentityList() ){ - if( identity.equalsIgnoreCase( fromIdentityName )){ - identities.add( toUserCache.getLoginIdentityName() ); - names.add( toUserCache.getLoginUserName() ); - unitNames.add( toUserCache.getLoginUserUnitName() ); - topUnitNames.add( toUserCache.getLoginUserTopUnitName() ); - }else{ - personName = userManagerService.getPersonNameByIdentity(identity); - unitName = userManagerService.getUnitNameByIdentity( identity ); - topUnitName = userManagerService.getTopUnitNameByIdentity( identity ); - identities.add( identity ); - if( personName != null ){ - names.add( personName ); - }else{ - names.add( personName ); - } - if( unitName != null ){ - unitNames.add( unitName ); - topUnitNames.add( topUnitName ); - }else{ - unitNames.add( "未知" ); - topUnitNames.add( "未知" ); - } - } - } - entity.setReportAuditLeaderIdentityList(identities); - entity.setReportAuditLeaderNameList(names); - entity.setReportAuditLeaderUnitNameList( unitNames ); - entity.setReportAuditLeaderTopUnitNameList( topUnitNames ); - } -// //修改auditLeaderIdentity相关的数据, 多值 -// if( ListTools.isNotEmpty(entity.getAuditLeaderIdentityList()) ){ -// List identities = new ArrayList<>(); -// List names = new ArrayList<>(); -// List unitNames = new ArrayList<>(); -// List topUnitNames = new ArrayList<>(); -// for( String identity : entity.getAuditLeaderIdentityList() ){ -// if( identity.equalsIgnoreCase( fromIdentityName )){ -// identities.add( toUserCache.getLoginIdentityName() ); -// names.add( toUserCache.getLoginUserName() ); -// unitNames.add( toUserCache.getLoginUserUnitName() ); -// topUnitNames.add( toUserCache.getLoginUserTopUnitName() ); -// }else{ -// identities.add( identity ); -// personName = userManagerService.getPersonNameByIdentity(identity); -// unitName = userManagerService.getUnitNameByIdentity( identity ); -// topUnitName = userManagerService.getTopUnitNameByIdentity( identity ); -// if( personName != null ){ -// names.add( personName ); -// }else{ -// names.add( "未知" ); -// } -// if( unitName != null ){ -// unitNames.add( unitName ); -// topUnitNames.add( topUnitName ); -// }else{ -// unitNames.add( "未知" ); -// topUnitNames.add( "未知" ); -// } -// } -// } -// entity.setAuditLeaderIdentityList( identities ); -// entity.setAuditLeaderNameList( names ); -// entity.setAuditLeaderUnitNameList( unitNames ); -// entity.setAuditLeaderTopUnitNameList( topUnitNames ); -// } - //修改defaultLeaderIdentityList相关的数据, 多值 - if( ListTools.isNotEmpty( entity.getDefaultLeaderIdentityList() ) && entity.getDefaultLeaderIdentityList().contains( fromIdentityName ) ){ - List identities = new ArrayList<>(); - List names = new ArrayList<>(); - for( String identity : entity.getDefaultLeaderIdentityList() ){ - if( identity.equalsIgnoreCase( fromIdentityName )){ - identities.add( toUserCache.getLoginIdentityName() ); - names.add( toUserCache.getLoginUserName() ); - }else{ - personName = userManagerService.getPersonNameByIdentity(identity); - identities.add( identity ); - if( personName != null ){ - names.add( personName ); - }else{ - names.add( personName ); - } - } - } - entity.setDefaultLeaderIdentityList( identities ); - entity.setDefaultLeaderList( names ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_CENTERWORKINFO]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_CENTERWORKINFO is not exists, can not change idenity for this center record!id:"+centerId); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORKBASEINFO里的相关身份以及名称组织信息

- * ARRIBUTE: creatorIdentity，deployerIdentity，responsibilityIdentity, cooperateIdentity，readLeaderIdentity, reportAdminIdentity - * - * @param centerRecords - * @param fromIdentityName - * @param isSameUser - * @param okrUserCache - * @throws Exception - */ - public void changeUserIdentityInWorkBaseInfo( String workId, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( workId != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkBaseInfo entity = null; - String personName = null; - String unitName = null; - String topUnitName = null; - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( workId, OkrWorkBaseInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class ); - if( entity != null ){ - //修改creatorIdentity相关的数据 - if( entity.getCreatorIdentity() != null && entity.getCreatorIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setCreatorName( toUserCache.getLoginUserName() ); - entity.setCreatorIdentity( toUserCache.getLoginIdentityName() ); - entity.setCreatorUnitName( toUserCache.getLoginUserUnitName() ); - entity.setCreatorTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改deployerIdentity相关的数据 - if( entity.getDeployerIdentity() != null && entity.getDeployerIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setDeployerName( toUserCache.getLoginUserName() ); - entity.setDeployerIdentity( toUserCache.getLoginIdentityName() ); - entity.setDeployerUnitName( toUserCache.getLoginUserUnitName() ); - entity.setDeployerTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改responsibilityIdentity相关的数据 - if( entity.getResponsibilityIdentity() != null && entity.getResponsibilityIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setResponsibilityEmployeeName( toUserCache.getLoginUserName() ); - entity.setResponsibilityIdentity( toUserCache.getLoginIdentityName() ); - entity.setResponsibilityUnitName( toUserCache.getLoginUserUnitName() ); - entity.setResponsibilityTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改reportAdminIdentity相关的数据 - if( entity.getReportAdminIdentity() != null && entity.getReportAdminIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setReportAdminName( toUserCache.getLoginUserName() ); - entity.setReportAdminIdentity( toUserCache.getLoginIdentityName() ); - } - //修改cooperateIdentity相关的数据, 多值 - if( ListTools.isNotEmpty(entity.getCooperateIdentityList()) ){ - List identities = new ArrayList<>(); - List names = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - for( String identity : entity.getCooperateIdentityList() ){ - if( identity.equalsIgnoreCase( fromIdentityName )){ - identities.add( toUserCache.getLoginIdentityName() ); - names.add( toUserCache.getLoginUserName() ); - unitNames.add( toUserCache.getLoginUserUnitName() ); - topUnitNames.add( toUserCache.getLoginUserTopUnitName() ); - }else{ - identities.add( identity ); - personName = userManagerService.getPersonNameByIdentity(identity); - unitName = userManagerService.getUnitNameByIdentity( identity ); - topUnitName = userManagerService.getTopUnitNameByIdentity( identity ); - if( personName != null ){ - names.add( personName ); - }else{ - names.add( "未知" ); - } - if( unitName != null ){ - unitNames.add( unitName ); - topUnitNames.add( topUnitName ); - }else{ - unitNames.add( "未知" ); - topUnitNames.add( "未知" ); - } - } - } - entity.setCooperateIdentityList( identities ); - entity.setCooperateEmployeeNameList( names ); - entity.setCooperateUnitNameList( unitNames ); - entity.setCooperateTopUnitNameList( topUnitNames ); - } - //修改readLeaderIdentity相关的数据, 多值 - if( ListTools.isNotEmpty( entity.getReadLeaderIdentityList())){ - List identities = new ArrayList<>(); - List names = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - for( String identity : entity.getReadLeaderIdentityList() ){ - if( identity.equalsIgnoreCase( fromIdentityName )){ - identities.add( toUserCache.getLoginIdentityName() ); - names.add( toUserCache.getLoginUserName() ); - unitNames.add( toUserCache.getLoginUserUnitName() ); - topUnitNames.add( toUserCache.getLoginUserTopUnitName() ); - }else{ - identities.add( identity ); - personName = userManagerService.getPersonNameByIdentity(identity); - unitName = userManagerService.getUnitNameByIdentity( identity ); - topUnitName = userManagerService.getTopUnitNameByIdentity( identity ); - if( personName != null ){ - names.add( personName ); - }else{ - names.add( "未知" ); - } - if( unitName != null ){ - unitNames.add( unitName ); - topUnitNames.add( topUnitName ); - }else{ - unitNames.add( "未知" ); - topUnitNames.add( "未知" ); - } - } - } - entity.setReadLeaderIdentityList( identities ); - entity.setReadLeaderNameList( names ); - entity.setReadLeaderUnitNameList( unitNames ); - entity.setReadLeaderTopUnitNameList( topUnitNames ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORKBASEINFO]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORKBASEINFO is not exists, can not change idenity for this record!id:"+ workId ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORK_AUTHORIZE_RECORD里的相关身份以及名称组织信息

- * ARRIBUTE: delegatorIdentity, targetIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInAuthorizeRecord( String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkAuthorizeRecord entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkAuthorizeRecord.class ); - emc.beginTransaction( OkrWorkAuthorizeRecord.class ); - if( entity != null ){ - //修改delegatorIdentity相关的数据 - if( entity.getDelegatorIdentity() != null && entity.getDelegatorIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setDelegatorName( toUserCache.getLoginUserName() ); - entity.setDelegatorIdentity( toUserCache.getLoginIdentityName() ); - entity.setDelegatorUnitName( toUserCache.getLoginUserUnitName() ); - entity.setDelegatorTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改targetIdentity相关的数据 - if( entity.getTargetIdentity() != null && entity.getTargetIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setTargetName( toUserCache.getLoginUserName() ); - entity.setTargetIdentity( toUserCache.getLoginIdentityName() ); - entity.setTargetUnitName( toUserCache.getLoginUserUnitName() ); - entity.setTargetTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORK_AUTHORIZE_RECORD]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORK_AUTHORIZE_RECORD is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORK_PERSON里的相关身份以及名称组织信息

- * ARRIBUTE: employeeIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInWorkPerson(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkPerson entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkPerson.class ); - emc.beginTransaction( OkrWorkPerson.class ); - if( entity != null ){ - //修改employeeIdentity相关的数据 - if( entity.getEmployeeIdentity() != null && entity.getEmployeeIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setEmployeeName( toUserCache.getLoginUserName() ); - entity.setEmployeeIdentity( toUserCache.getLoginIdentityName() ); - entity.setUnitName( toUserCache.getLoginUserUnitName() ); - entity.setTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORK_PERSON]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORK_PERSON is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORK_REPORTBASEINFO里的相关身份以及名称组织信息

- * ARRIBUTE: creatorIdentity,workAdminIdentity,reporterIdentity,currentProcessorIdentity,readLeadersIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInReportBaseInfo( String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser ) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkReportBaseInfo entity = null; - String personName = null; - String unitName = null; - String topUnitName = null; - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - if( entity != null ){ - //修改creatorIdentity相关的数据 - if( entity.getCreatorIdentity() != null && entity.getCreatorIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setCreatorName( toUserCache.getLoginUserName() ); - entity.setCreatorIdentity( toUserCache.getLoginIdentityName() ); - entity.setCreatorUnitName( toUserCache.getLoginUserUnitName() ); - entity.setCreatorTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改workAdminIdentity相关的数据 - if( entity.getWorkAdminIdentity() != null && entity.getWorkAdminIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setWorkAdminName( toUserCache.getLoginUserName() ); - entity.setWorkAdminIdentity( toUserCache.getLoginIdentityName() ); - } - //修改reporterIdentity相关的数据 - if( entity.getReporterIdentity() != null && entity.getReporterIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setReporterName( toUserCache.getLoginUserName() ); - entity.setReporterIdentity( toUserCache.getLoginIdentityName() ); - entity.setReporterUnitName( toUserCache.getLoginUserUnitName() ); - entity.setReporterTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改currentProcessorIdentity相关的数据 - if( ListTools.isNotEmpty( entity.getCurrentProcessorIdentityList() )){ - entity.setCurrentProcessorNameList( new ArrayList<>()); - entity.setCurrentProcessorIdentityList( new ArrayList<>()); - entity.setCurrentProcessorUnitNameList( new ArrayList<>()); - entity.setCurrentProcessorTopUnitNameList( new ArrayList<>()); - for( String identity : entity.getCurrentProcessorIdentityList() ){ - if( identity.equalsIgnoreCase( fromIdentityName )){ - entity.getCurrentProcessorNameList().add(toUserCache.getLoginUserName()); - entity.getCurrentProcessorIdentityList().add(toUserCache.getLoginIdentityName()); - entity.getCurrentProcessorUnitNameList().add(toUserCache.getLoginUserUnitName()); - entity.getCurrentProcessorTopUnitNameList().add(toUserCache.getLoginUserTopUnitName()); - }else{ - personName = userManagerService.getPersonNameByIdentity( identity ); - unitName = userManagerService.getUnitNameByIdentity( identity ); - topUnitName = userManagerService.getTopUnitNameByIdentity( identity ); - if( personName != null ){ - entity.getCurrentProcessorNameList().add(personName); - }else{ - entity.getCurrentProcessorNameList().add("未知"); - } - if( unitName != null ){ - entity.getCurrentProcessorUnitNameList().add(unitName); - entity.getCurrentProcessorTopUnitNameList().add(topUnitName); - }else{ - entity.getCurrentProcessorUnitNameList().add("未知"); - entity.getCurrentProcessorTopUnitNameList().add("未知"); - } - } - } - } - //修改readLeadersIdentity相关的数据, 多值 - if( ListTools.isNotEmpty( entity.getReadLeadersIdentityList() ) && entity.getReadLeadersIdentityList().contains( fromIdentityName) ){ - List identities = new ArrayList<>(); - List names = new ArrayList<>(); - for( String identity : entity.getReadLeadersIdentityList() ){ - if( identity.equalsIgnoreCase( fromIdentityName )){ - identities.add( toUserCache.getLoginIdentityName() ); - names.add( toUserCache.getLoginUserName() ); - }else{ - personName = userManagerService.getPersonNameByIdentity(identity); - if( personName != null ){ - identities.add( identity ); - names.add( personName ); - }else{ - identities.add( identity ); - names.add( "未知" ); - } - } - } - entity.setReadLeadersIdentityList( identities ); - entity.setReadLeadersNameList( names ); - } - - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORK_REPORTBASEINFO]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORK_REPORTBASEINFO is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORK_REPORT_PERSONLINK里的相关身份以及名称组织信息

- * ARRIBUTE: processorIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInReportPersonLink(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkReportPersonLink entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - if( entity != null ){ - //修改processorIdentity相关的数据 - if( entity.getProcessorIdentity() != null && entity.getProcessorIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setProcessorName( toUserCache.getLoginUserName() ); - entity.setProcessorIdentity( toUserCache.getLoginIdentityName() ); - entity.setProcessorUnitName( toUserCache.getLoginUserUnitName() ); - entity.setProcessorTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORK_REPORT_PERSONLINK]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORK_REPORT_PERSONLINK is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORK_REPORT_PROCESSLOG里的相关身份以及名称组织信息

- * ARRIBUTE: processorIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInReportProcessLog(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkReportProcessLog entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - if( entity != null ){ - //修改processorIdentity相关的数据 - if( entity.getProcessorIdentity() != null && entity.getProcessorIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setProcessorName( toUserCache.getLoginUserName() ); - entity.setProcessorIdentity( toUserCache.getLoginIdentityName() ); - entity.setProcessorUnitName( toUserCache.getLoginUserUnitName() ); - entity.setProcessorTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORK_REPORT_PROCESSLOG]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORK_REPORT_PROCESSLOG is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORKCHAT里的相关身份以及名称组织信息

- * ARRIBUTE: targetIdentity,senderIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInWorkChat(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkChat entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkChat.class ); - emc.beginTransaction( OkrWorkChat.class ); - if( entity != null ){ - //修改senderIdentity相关的数据 - if( entity.getSenderIdentity() != null && entity.getSenderIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setSenderName( toUserCache.getLoginUserName() ); - entity.setSenderIdentity( toUserCache.getLoginIdentityName() ); - } - //修改targetIdentity相关的数据 - if( entity.getTargetIdentity() != null && entity.getTargetIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setTargetName( toUserCache.getLoginUserName() ); - entity.setTargetIdentity( toUserCache.getLoginIdentityName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORKCHAT]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORKCHAT is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_WORKDYNAMICS里的相关身份以及名称组织信息

- * ARRIBUTE: targetIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInDynamics(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrWorkDynamics entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrWorkDynamics.class ); - emc.beginTransaction( OkrWorkDynamics.class ); - if( entity != null ){ - //修改targetIdentity相关的数据 - if( entity.getTargetIdentity() != null && entity.getTargetIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setTargetName( toUserCache.getLoginUserName() ); - entity.setTargetIdentity( toUserCache.getLoginIdentityName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_WORKDYNAMICS]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_WORKDYNAMICS is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * 修改表OKR_TASK里的相关身份以及名称组织信息

- * ARRIBUTE: targetIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInTask(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrTask entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrTask.class ); - emc.beginTransaction( OkrTask.class ); - if( entity != null ){ - //修改targetIdentity相关的数据 - if( entity.getTargetIdentity() != null && entity.getTargetIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setTargetName( toUserCache.getLoginUserName() ); - entity.setTargetIdentity( toUserCache.getLoginIdentityName() ); - entity.setTargetUnitName( toUserCache.getLoginUserUnitName() ); - entity.setTargetTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_TASK]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_TASK is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_TASKHANDLED里的相关身份以及名称组织信息

- * ARRIBUTE: targetIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInTaskhandled(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrTaskHandled entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrTaskHandled.class ); - emc.beginTransaction( OkrTaskHandled.class ); - if( entity != null ){ - //修改targetIdentity相关的数据 - if( entity.getTargetIdentity() != null && entity.getTargetIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setTargetName( toUserCache.getLoginUserName() ); - entity.setTargetIdentity( toUserCache.getLoginIdentityName() ); - entity.setTargetUnitName( toUserCache.getLoginUserUnitName() ); - entity.setTargetTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_TASKHANDLED]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_TASKHANDLED is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * 修改表OKR_CONFIG_SECRETARY里的相关身份以及名称组织信息

- * ARRIBUTE: leaderIdentity,secretaryIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInConfigSecretary(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrConfigSecretary entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrConfigSecretary.class ); - emc.beginTransaction( OkrConfigSecretary.class ); - if( entity != null ){ - //修改leaderIdentity相关的数据 - if( entity.getLeaderIdentity() != null && entity.getLeaderIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setLeaderName( toUserCache.getLoginUserName() ); - entity.setLeaderIdentity( toUserCache.getLoginIdentityName() ); - entity.setLeaderUnitName( toUserCache.getLoginUserUnitName() ); - entity.setLeaderTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - //修改secretaryIdentity相关的数据 - if( entity.getSecretaryIdentity() != null && entity.getSecretaryIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setSecretaryName( toUserCache.getLoginUserName() ); - entity.setSecretaryIdentity( toUserCache.getLoginIdentityName() ); - entity.setSecretaryUnitName( toUserCache.getLoginUserUnitName() ); - entity.setSecretaryTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_CONFIG_SECRETARY]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_CONFIG_SECRETARY is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * 修改表OKR_CONFIG_SYSTEM里的相关身份以及名称组织信息

- * ARRIBUTE: configValue - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInConfigSystem(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrConfigSystem entity = null; - String identityString = null; - String[] array = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrConfigSystem.class ); - emc.beginTransaction( OkrConfigSystem.class ); - if( entity != null ){ - //修改configValue相关的数据, 多值 - if( entity.getConfigValue() != null && entity.getConfigValue().indexOf( fromIdentityName ) >=0 ){ - identityString = ""; - array = entity.getConfigValue().split( "," ); - for( String idx : array ){ - if( identityString != null && !identityString.isEmpty() ){ - identityString += ","; - } - if( idx.equalsIgnoreCase( fromIdentityName )){ - identityString += toUserCache.getLoginIdentityName(); - }else{ - identityString += idx; - } - } - entity.setConfigValue(identityString); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_CONFIG_SYSTEM]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_CONFIG_SYSTEM is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * 修改表OKR_STATISTIC_REPORT_CONTENT里的相关身份以及名称组织信息

- * ARRIBUTE: responsibilityIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInStReportContent(String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrStatisticReportContent entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrStatisticReportContent.class ); - emc.beginTransaction( OkrStatisticReportContent.class ); - if( entity != null ){ - //修改responsibilityIdentity相关的数据 - if( entity.getResponsibilityIdentity() != null && entity.getResponsibilityIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setResponsibilityEmployeeName( toUserCache.getLoginUserName() ); - entity.setResponsibilityIdentity( toUserCache.getLoginIdentityName() ); - entity.setResponsibilityUnitName( toUserCache.getLoginUserUnitName() ); - entity.setResponsibilityTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_STATISTIC_REPORT_CONTENT]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_STATISTIC_REPORT_CONTENT is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - /** - * TODO:修改表OKR_STATISTIC_REPORT_STATUS里的相关身份以及名称组织信息

- * ARRIBUTE: responsibilityIdentity - * - * @param id - * @param fromIdentityName - * @param toUserCache - * @param isSameUser - * - * @throws Exception - */ - public void changeUserIdentityInStReportStatus( String id, String fromIdentityName, OkrUserCache toUserCache, Boolean isSameUser) throws Exception { - if( id != null && fromIdentityName != null && toUserCache != null ){ - OkrStatisticReportStatus entity = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - entity = emc.find( id, OkrStatisticReportStatus.class ); - emc.beginTransaction( OkrStatisticReportStatus.class ); - if( entity != null ){ - //修改responsibilityIdentity相关的数据 - if( entity.getResponsibilityIdentity() != null && entity.getResponsibilityIdentity().equalsIgnoreCase( fromIdentityName )){ - entity.setResponsibilityEmployeeName( toUserCache.getLoginUserName() ); - entity.setResponsibilityIdentity( toUserCache.getLoginIdentityName() ); - entity.setResponsibilityUnitName( toUserCache.getLoginUserUnitName() ); - entity.setResponsibilityTopUnitName( toUserCache.getLoginUserTopUnitName() ); - } - emc.check( entity, CheckPersistType.all ); - emc.commit(); - logger.info( "[OKR_STATISTIC_REPORT_STATUS]:" + fromIdentityName + " to "+ toUserCache.getLoginIdentityName() +", 系统数据修改完成," + entity.getId() ); - }else{ - logger.warn("OKR_STATISTIC_REPORT_STATUS is not exists, can not change idenity for this record!id:"+ id ); - } - }catch( Exception e ){ - throw e; - } - } - } - public OkrErrorIdentityRecords getErrorIdentityRecords(String identity) throws Exception { - Business business = null; - List list = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - list = business.okrErrorSystemIdentityInfoFactory().listRecordsByIdentityName( identity ); - if( list != null && !list.isEmpty() ){ - return list.get(0); - }else{ - return null; - } - }catch( Exception e ){ - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskHandledService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskHandledService.java deleted file mode 100644 index cb9efc4cd8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskHandledService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.x.okr.assemble.control.service; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.okr.entity.OkrTaskHandled; - -/** - * 类 名：OkrTaskHandledService
- * 实体类：OkrTaskHandled
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrTaskHandledService{ - - /** - * 根据传入的ID从数据库查询OkrTaskHandled对象 - * @param id - * @return - * @throws Exception - */ - public OkrTaskHandled get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrTaskHandled.class ); - }catch( Exception e ){ - throw e; - } - } - - - - /** - * 根据ID从数据库中删除OkrTaskHandled对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrTaskHandled okrTaskHandled = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrTaskHandled = emc.find(id, OkrTaskHandled.class); - if (null == okrTaskHandled) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrTaskHandled.class ); - emc.remove( okrTaskHandled, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskService.java deleted file mode 100644 index c3be9116c8..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrTaskService.java +++ /dev/null @@ -1,748 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; - -/** - * 类 名：OkrTaskService
- * 实体类：OkrTask
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrTaskService{ - private static Logger logger = LoggerFactory.getLogger( OkrTaskService.class ); - private DateOperation dateOperation = new DateOperation(); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - - /** - * 根据传入的ID从数据库查询OkrTask对象 - * @param id - * @return - * @throws Exception - */ - public OkrTask get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrTask.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据ID从数据库中删除OkrTask对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrTask okrTask = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrTask = emc.find(id, OkrTask.class); - if (null == okrTask) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrTask.class ); - emc.remove( okrTask, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - /** - * 为责任者生成工作确认的待办信息 - * @param okrWorkBaseInfo - * @throws Exception - */ - public void createTaskForResponsibility( OkrWorkBaseInfo okrWorkBaseInfo ) throws Exception { - if( okrWorkBaseInfo == null ){ - throw new Exception( "工作信息对象为空，无法生成待办信息！" ); - } - Business business = null; - OkrTask okrTask_tmp = null; - List ids = null; - List okrTaskList = getResponsibilityTask( okrWorkBaseInfo ); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - for( OkrTask okrTask : okrTaskList ){ - //根据工作ID，处理人，处理环节名称查询一下是否存在待办信息，如果存在则进行删除 - ids = business.okrTaskFactory().listIdsByWorkAndTarget( okrTask.getWorkId(), okrTask.getTargetName(), okrTask.getActivityName() ); - emc.beginTransaction( OkrTask.class ); - if( ids != null && ids.size() > 0 ){ - for( String id : ids ){ - okrTask_tmp = emc.find( id, OkrTask.class ); - if( okrTask_tmp != null ){ - emc.remove( okrTask_tmp ); - } - } - } - emc.persist( okrTask, CheckPersistType.all ); - } - emc.commit(); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 为责任者生成待办信息 - * @param okrWorkBaseInfo - * @return - * @throws Exception - */ - private List getResponsibilityTask( OkrWorkBaseInfo okrWorkBaseInfo ) throws Exception { - if( okrWorkBaseInfo == null ){ - throw new Exception( "okrWorkBaseInfo is null, can not create any task!" ); - } - Date now = new Date(); - List okrTaskList = new ArrayList(); - - OkrTask okrTask = null; - String splitFlag = ","; - String[] targetNameArray = null; - String[] targetUnitNameArray = null; - String[] targetTopUnitNameArray = null; - String targetName = okrWorkBaseInfo.getResponsibilityEmployeeName(); - String targetUnitName = okrWorkBaseInfo.getResponsibilityUnitName(); - String targetTopUnitName = okrWorkBaseInfo.getResponsibilityTopUnitName(); - if( targetName != null ){ - if( targetUnitName == null ){ - throw new Exception( "ResponsibilityUnitName is null, can not create any task!" ); - } - if( targetTopUnitName == null ){ - throw new Exception( "ResponsibilityTopUnitName is null, can not create any task!" ); - } - targetNameArray = targetName.split( splitFlag ); - targetUnitNameArray = targetUnitName.split( splitFlag ); - targetTopUnitNameArray = targetTopUnitName.split( splitFlag ); - if( targetNameArray.length == targetUnitNameArray.length ){ - if( targetNameArray.length == targetTopUnitNameArray.length ){ - for( int i=0; i ids = null; - Business business = null; - String personName = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - personName = okrUserManagerService.getPersonNameByIdentity( userIdentity ); - //查询该用户在指定的中心工作中的待办信息 - ids = business.okrTaskFactory().listIdsByCenterAndPerson( okrCenterWorkInfo.getId(), userIdentity, "中心工作" ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - - if( ids != null && !ids.isEmpty() ){ - for( String id : ids ){ - okrTask = emc.find( id, OkrTask.class ); - if( personName != null ){ - okrTaskHandled = new OkrTaskHandled(); - okrTaskHandled.setActivityName( "工作确认" ); - if( okrTask != null ){ - okrTaskHandled.setArriveDateTime( okrTask.getArriveDateTime() ); - okrTaskHandled.setArriveDateTimeStr( okrTask.getArriveDateTimeStr() ); - } - okrTaskHandled.setCenterId( okrCenterWorkInfo.getId() ); - okrTaskHandled.setCenterTitle( okrCenterWorkInfo.getTitle() ); - okrTaskHandled.setDynamicObjectId( okrCenterWorkInfo.getId() ); - okrTaskHandled.setDynamicObjectTitle( okrCenterWorkInfo.getTitle() ); - okrTaskHandled.setDynamicObjectType( "中心工作" ); - okrTaskHandled.setProcessDateTime( new Date() ); - okrTaskHandled.setProcessDateTimeStr( dateOperation.getNowDateTime() ); - okrTaskHandled.setTargetTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( userIdentity )); - okrTaskHandled.setTargetIdentity( userIdentity ); - okrTaskHandled.setTargetName( personName ); - okrTaskHandled.setTargetUnitName( okrUserManagerService.getUnitNameByIdentity( userIdentity ) ); - okrTaskHandled.setTitle( okrCenterWorkInfo.getTitle() ); - okrTaskHandled.setViewUrl( "" ); - okrTaskHandled.setWorkId( null ); - okrTaskHandled.setWorkTitle( null ); - okrTaskHandled.setWorkType( okrCenterWorkInfo.getDefaultWorkType() ); - emc.persist( okrTaskHandled, CheckPersistType.all ); - } - if( okrTask != null ){ - emc.remove( okrTask, CheckRemoveType.all ); - } - } - } - emc.commit(); - }catch( Exception e ){ - logger.warn( "create task info got a error!", e); - throw e; - } - } - - public void createTaskProcessors( OkrCenterWorkInfo okrCenterWorkInfo, List taskUserIdentityList ) throws Exception { - if( okrCenterWorkInfo == null ){ - throw new Exception( "okrCenterWorkInfo is null, can not create task for user!" ); - } - if( taskUserIdentityList == null || taskUserIdentityList.size() == 0 ){ - throw new Exception( "taskUserIdentityList is null, can not create task for user!" ); - } - OkrTask okrTask = null; - Date now = new Date(); - List ids = null; - Business business = null; - String personName = null; - String unitName = null; - String topUnitName = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction( OkrTask.class ); - for( String identity : taskUserIdentityList ){ - //要先查询一下该员工在该中心工作 相同环节上有没有待办，如果有，则不新增 - ids = business.okrTaskFactory().listIdsByCenterAndIdentityActivity( "中心工作", okrCenterWorkInfo.getId(), identity, "TASK", "工作确认" ); - if( ids == null || ids.size() == 0 ){ - //根据身份查询用户的组织和顶层组织 - personName = okrUserManagerService.getPersonNameByIdentity( identity ); - if( personName != null ){ - unitName = okrUserManagerService.getUnitNameByIdentity( identity ); - topUnitName = okrUserManagerService.getTopUnitNameByIdentity( identity ); - okrTask = new OkrTask(); - okrTask.setTitle( okrCenterWorkInfo.getTitle() ); - okrTask.setCenterId( okrCenterWorkInfo.getId() ); - okrTask.setCenterTitle( okrCenterWorkInfo.getTitle() ); - okrTask.setWorkType( okrCenterWorkInfo.getDefaultWorkType() ); - okrTask.setTargetIdentity( identity ); - okrTask.setTargetName( personName ); - if( unitName != null ){ - okrTask.setTargetUnitName( unitName ); - } - if( topUnitName != null ){ - okrTask.setTargetTopUnitName( topUnitName ); - } - okrTask.setActivityName( "工作确认" ); - okrTask.setArriveDateTime( now ); - okrTask.setArriveDateTimeStr( dateOperation.getDateStringFromDate( now, "yyyy-MM-dd HH:mm:ss" ) ); - okrTask.setDynamicObjectId( okrCenterWorkInfo.getId() ); - okrTask.setDynamicObjectTitle( okrCenterWorkInfo.getTitle() ); - okrTask.setDynamicObjectType( "中心工作" ); - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - }else{ - - } - } - } - emc.commit(); - }catch( Exception e ){ - logger.warn( "create task info got a error!", e); - throw e; - } - } - - public void createTaskForReaders(OkrCenterWorkInfo okrCenterWorkInfo, List readUserIdentityList ) throws Exception { - if( okrCenterWorkInfo == null ){ - throw new Exception( "okrCenterWorkInfo is null, can not create task for user!" ); - } - if( readUserIdentityList == null || readUserIdentityList.size() == 0 ){ - throw new Exception( "readUserIdentityList is null, can not create task for user!" ); - } - OkrTask okrTask = null; - Date now = new Date(); - List ids = null; - Business business = null; - String personName = null; - String unitName = null; - String topUnitName = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction( OkrTask.class ); - for( String identity : readUserIdentityList ){ - //要先查询一下该员工在该中心工作 相同环节上有没有待办，如果有，则不新增 - ids = business.okrTaskFactory().listIdsByCenterAndIdentityActivity( "中心工作", okrCenterWorkInfo.getId(), identity, "TASK", "工作阅知" ); - if( ids == null || ids.size() == 0 ){ - //根据身份查询用户的组织和顶层组织 - personName = okrUserManagerService.getPersonNameByIdentity( identity ); - if( personName != null ){ - unitName = okrUserManagerService.getUnitNameByIdentity( identity ); - topUnitName = okrUserManagerService.getTopUnitNameByIdentity( identity ); - okrTask = new OkrTask(); - okrTask.setTitle( okrCenterWorkInfo.getTitle() ); - okrTask.setCenterId( okrCenterWorkInfo.getId() ); - okrTask.setCenterTitle( okrCenterWorkInfo.getTitle() ); - okrTask.setWorkType( okrCenterWorkInfo.getDefaultWorkType() ); - okrTask.setTargetIdentity( identity ); - okrTask.setTargetName( personName ); - if( unitName != null ){ - okrTask.setTargetUnitName( unitName ); - } - if( topUnitName != null ){ - okrTask.setTargetTopUnitName( topUnitName ); - } - okrTask.setActivityName( "工作阅知" ); - okrTask.setArriveDateTime( now ); - okrTask.setArriveDateTimeStr( dateOperation.getDateStringFromDate( now, "yyyy-MM-dd HH:mm:ss" ) ); - okrTask.setDynamicObjectId( okrCenterWorkInfo.getId() ); - okrTask.setDynamicObjectTitle( okrCenterWorkInfo.getTitle() ); - okrTask.setDynamicObjectType( "中心工作" ); - okrTask.setProcessType( "READ" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - }else{ - - } - } - } - emc.commit(); - }catch( Exception e ){ - logger.warn( "create read info got a error!", e); - throw e; - } - } - - /** - * 查询在中心中工作是否有指定员工的待办信息 - * @param centerId - * @param userName 可能多值 - * @return - * @throws Exception - */ - public List listIdsByCenterAndPerson( String centerId, String identity, String dynamicObjectType ) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not excute query." ); - } - if( identity == null || identity.isEmpty() ){ - throw new Exception( "identity is null, system can not excute query." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().listIdsByCenterAndPerson( centerId, identity, dynamicObjectType ); - } catch ( Exception e ) { - throw e; - } - } - - public List listIdsByTargetActivityAndObjId( String dynamicObjectType, String objectId, String activityName, String processorIdentity ) throws Exception { - if( dynamicObjectType == null || dynamicObjectType.isEmpty() ){ - throw new Exception( "dynamicObjectType is null, system can not excute query." ); - } - if( objectId == null || objectId.isEmpty() ){ - throw new Exception( "objectId is null, system can not excute query." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().listIdsByTargetActivityAndObjId( null, dynamicObjectType, objectId, activityName, processorIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public List list(List ids) throws Exception { - if( ids == null || ids.isEmpty() ){ - throw new Exception( "ids is null, system can not excute query." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().list(ids); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据待办各类获取人员身份列表 - * @param taskTypeList - * @return - * @throws Exception - */ - public List listDistinctIdentity( List taskTypeList ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().listDistinctIdentity( taskTypeList ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据待办类别和用户身份，获取用户的待办数量 - * @param taskTypeList - * @param userIdentity - * @return - * @throws Exception - */ - public Long getTaskCount( List taskTypeList, String userIdentity, String workTypeName ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().getTaskCount( taskTypeList, userIdentity, workTypeName ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getNotReportConfirmTaskCount( List taskTypeList, String userIdentity, String workTypeName ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().getNotReportConfirmTaskCount( taskTypeList, userIdentity, workTypeName ); - } catch ( Exception e ) { - throw e; - } - } - - public List listTaskByTaskType(List taskTypeList, String userIdentity, String workTypeName) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().listTaskByTaskType( taskTypeList, userIdentity, workTypeName ); - } catch ( Exception e ) { - throw e; - } - } - - public List listReadByTaskType(List taskTypeList, String userIdentity, String workTypeName) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().listReadByTaskType( taskTypeList, userIdentity, workTypeName ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 处理待阅信息 - * @param okrTask - * @throws Exception - */ - public void processRead( OkrTask okrTask ) throws Exception { - if( okrTask == null ){ - return; - } - if( "中心工作".equals( okrTask.getDynamicObjectType() )){ - //说明是工作部署的阅知信息，一般是协助者和工作阅知者有该信息 - processWorkDeployRead( okrTask ); - }else if( "汇报确认".equals( okrTask.getDynamicObjectType() )){ - //说明是工作汇报的阅知信息，一般是工作汇报审批完成后，以阅知形式返回汇报人 - processWorkReportRead( okrTask ); - } - } - - private void processWorkReportRead( OkrTask okrTask ) throws Exception { - //1、根据待阅信息生成已阅信息 - OkrTaskHandled okrTaskHandled = getTaskHandledByTask( okrTask ); - //2、删除待阅信息，保存已阅信息 - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrTask = emc.find( okrTask.getId(), OkrTask.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - emc.persist(okrTaskHandled, CheckPersistType.all ); - emc.remove( okrTask, CheckRemoveType.all ); - emc.commit(); - } catch ( Exception e ) { - throw e; - } - } - - private void processWorkDeployRead( OkrTask okrTask ) throws Exception { - List ids = null; - List status = new ArrayList(); - List personList = null; - //1、根据待阅信息生成已阅信息 - OkrTaskHandled okrTaskHandled = getTaskHandledByTask( okrTask ); - //2、删除待阅信息, 保存已阅信息 - //3、如果是工作部署待阅，记录一下该用户的访问时间 - Business business = null; - Date now = new Date(); - status.add( "正常" ); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - ids = business.okrWorkPersonFactory().listByCenterAndPerson( - okrTask.getCenterId(), - okrTask.getTargetIdentity(), - "阅知者", - status ); - if( ids != null && !ids.isEmpty()){ - personList = business.okrWorkPersonFactory().list(ids); - } - - //查询该用户身份需要处理的WorkPerson信息 - okrTask = emc.find( okrTask.getId(), OkrTask.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - emc.beginTransaction( OkrWorkPerson.class ); - if( personList != null && !personList.isEmpty()){ - for( OkrWorkPerson okrWorkPerson : personList ){ - okrWorkPerson.setViewTime( dateOperation.getDateStringFromDate( now, "yyyy-MM-dd HH:mm:ss" ) ); - emc.check( okrWorkPerson, CheckPersistType.all ); - } - } - emc.persist(okrTaskHandled, CheckPersistType.all ); - emc.remove( okrTask, CheckRemoveType.all ); - emc.commit(); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据待办待阅信息，创建一个新的已办或者已阅信息对象 - * @param okrTask - * @return - */ - public OkrTaskHandled getTaskHandledByTask(OkrTask okrTask) { - OkrTaskHandled okrTaskHandled = new OkrTaskHandled(); - okrTaskHandled.setTitle( okrTask.getTitle() ); - okrTaskHandled.setCenterId( okrTask.getCenterId() ); - okrTaskHandled.setCenterTitle( okrTask.getCenterTitle() ); - okrTaskHandled.setWorkId( okrTask.getWorkId() ); - okrTaskHandled.setWorkTitle( okrTask.getWorkTitle() ); - okrTaskHandled.setWorkType( okrTask.getWorkType() ); - okrTaskHandled.setDynamicObjectId( okrTask.getDynamicObjectId() ); - okrTaskHandled.setDynamicObjectTitle( okrTask.getDynamicObjectTitle() ); - okrTaskHandled.setDynamicObjectType( okrTask.getDynamicObjectType() ); - okrTaskHandled.setActivityName( okrTask.getActivityName() ); - okrTaskHandled.setTargetTopUnitName( okrTask.getTargetTopUnitName() ); - okrTaskHandled.setTargetIdentity( okrTask.getTargetIdentity() ); - okrTaskHandled.setTargetName( okrTask.getTargetName() ); - okrTaskHandled.setTargetUnitName( okrTask.getTargetUnitName() ); - okrTaskHandled.setArriveDateTime( okrTask.getArriveDateTime() ); - okrTaskHandled.setArriveDateTimeStr( okrTask.getArriveDateTimeStr() ); - okrTaskHandled.setProcessDateTime( new Date() ); - okrTaskHandled.setProcessDateTimeStr( dateOperation.getNowDateTime() ); - okrTaskHandled.setViewUrl( "" ); - return okrTaskHandled; - } - - /** - * 根据用户唯一标识来查询用户信息 - * @param taskTypeList - * @param name - * @return - * @throws Exception - */ - public Long getTaskCountByUserName( List taskTypeList, List notInTaskTypeList, String name ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, system can not excute query." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrTaskFactory().getTaskCountByUserName( taskTypeList, notInTaskTypeList, name ); - } catch ( Exception e ) { - throw e; - } - } - - public List listIdsByReportId(String id) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not excute query." ); - } - List ids = null; - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - ids = business.okrTaskFactory().listIdsByReportId( id ); - return business.okrTaskFactory().list(ids); - } catch ( Exception e ) { - throw e; - } - } - -// /** -// * 为协助者生成待办信息 -// * @param okrWorkBaseInfo -// * @return -// * @throws Exception -// */ -// private List getCooperateTask( OkrWorkBaseInfo okrWorkBaseInfo ) throws Exception { -// if( okrWorkBaseInfo == null ){ -// throw new Exception( "okrWorkBaseInfo is null, can not create any task!" ); -// } -// Date now = new Date(); -// List okrTaskList = new ArrayList(); -// -// OkrTask okrTask = null; -// String splitFlag = ","; -// String[] targetNameArray = null; -// String[] targetUnitNameArray = null; -// String[] targetTopUnitNameArray = null; -// String targetName = okrWorkBaseInfo.getCooperateEmployeeName(); -// String targetUnitName = okrWorkBaseInfo.getCooperateUnitName(); -// String targetTopUnitName = okrWorkBaseInfo.getCooperateTopUnitName(); -// if( targetName != null ){ -// if( targetUnitName == null ){ -// throw new Exception( "CooperateUnitName is null, can not create any task!" ); -// } -// if( targetTopUnitName == null ){ -// throw new Exception( "CooperateTopUnitName is null, can not create any task!" ); -// } -// targetNameArray = targetName.split( splitFlag ); -// targetUnitNameArray = targetUnitName.split( splitFlag ); -// targetTopUnitNameArray = targetTopUnitName.split( splitFlag ); -// if( targetNameArray.length == targetUnitNameArray.length ){ -// if( targetNameArray.length == targetTopUnitNameArray.length ){ -// for( int i=0; i getLeaderReadTask( OkrWorkBaseInfo okrWorkBaseInfo ) throws Exception { -// if( okrWorkBaseInfo == null ){ -// throw new Exception( "okrWorkBaseInfo is null, can not create any task!" ); -// } -// Date now = new Date(); -// List okrTaskList = new ArrayList(); -// -// OkrTask okrTask = null; -// String splitFlag = ","; -// String[] targetNameArray = null; -// String[] targetUnitNameArray = null; -// String[] targetTopUnitNameArray = null; -// String targetName = okrWorkBaseInfo.getReadLeaderName(); -// String targetUnitName = okrWorkBaseInfo.getReadLeaderUnitName(); -// String targetTopUnitName = okrWorkBaseInfo.getReadLeaderTopUnitName(); -// if( targetName != null ){ -// if( targetUnitName == null ){ -// throw new Exception( "ReadLeaderUnitName is null, can not create any task!" ); -// } -// if( targetTopUnitName == null ){ -// throw new Exception( "ReadLeaderTopUnitName is null, can not create any task!" ); -// } -// targetNameArray = targetName.split( splitFlag ); -// targetUnitNameArray = targetUnitName.split( splitFlag ); -// targetTopUnitNameArray = targetTopUnitName.split( splitFlag ); -// if( targetNameArray.length == targetUnitNameArray.length ){ -// if( targetNameArray.length == targetTopUnitNameArray.length ){ -// for( int i=0; i - * 实体类：OkrUserInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:26 -**/ -public class OkrUserInfoService{ - - private Ehcache cache = ApplicationCache.instance().getCache( OkrUserInfo.class); - - private static Logger logger = LoggerFactory.getLogger( OkrUserInfoService.class ); - /** - * 根据传入的ID从数据库查询OkrUserInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrUserInfo get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrUserInfo.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 根据传入的ID从数据库查询OkrUserInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrUserInfo getWithPersonName( String name ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, return null!" ); - } - Business business = null; - List okrUserInfoList = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - okrUserInfoList = business.okrUserInfoFactory().listWithPerson( name ); - if( okrUserInfoList != null && !okrUserInfoList.isEmpty() ){ - return okrUserInfoList.get(0); - }else{ - return null; - } - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrUserInfo对象 - * @param wrapIn - */ - public OkrUserInfo save( OkrUserInfo userInfo ) throws Exception { - List okrUserInfoList = null; - OkrUserInfo okrUserInfo = null; - Business business = null; - if( userInfo.getUserName() !=null && !userInfo.getUserName().isEmpty() ){ - //根据用户姓名查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - okrUserInfoList = business.okrUserInfoFactory().listWithPerson( userInfo.getUserName() ); - emc.beginTransaction( OkrUserInfo.class ); - if( okrUserInfoList == null || okrUserInfoList.isEmpty() ){ - userInfo.setId( OkrUserInfo.createId() ); - emc.persist( userInfo, CheckPersistType.all ); - }else{ - for( int i=0;i okrUserInfoList = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - okrUserInfoList = business.okrUserInfoFactory().listWithPerson( name ); - if( okrUserInfoList != null && !okrUserInfoList.isEmpty() ){ - for( OkrUserInfo userInfo : okrUserInfoList ){ - emc.beginTransaction( OkrUserInfo.class ); - emc.remove( userInfo, CheckRemoveType.all ); - emc.commit(); - } - } - }catch( Exception e ){ - throw e; - } - } - - /** - * 获取用户登录的代理身份 - * - * 先从缓存里取信息，如果没有再从数据库中获取信息 - * - * @param name - * @throws Exception - */ - public OkrUserInfo getOkrUserInfoWithPersonName(String name) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, return null!" ); - } - String cacheKey = ThisApplication.getOkrUserInfoCacheKey( name ); - Element element = cache.get( cacheKey ); - OkrUserInfo okrUserInfo = null; - if( element != null ) { - okrUserInfo = (OkrUserInfo)element.getObjectValue(); - }else { - okrUserInfo = getWithPersonName( name ); - cache.put( new Element( cacheKey, okrUserInfo ) ); - } - return okrUserInfo; - } - - public OkrUserCache getOkrUserCacheWithPersonName( String name ) throws Exception { - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, return null!" ); - } - OkrUserInfo okrUserInfo = getOkrUserInfoWithPersonName( name ); - Gson gson = XGsonBuilder.instance(); - if( okrUserInfo !=null && okrUserInfo.getCustomContent() != null && !okrUserInfo.getCustomContent().isEmpty() ){ - return gson.fromJson( okrUserInfo.getCustomContent(), OkrUserCache.class ); - } - return null; - } - - /** - * 获取用户登录的代理身份 - * - * @param name - * @throws Exception - */ - public Boolean getIsOkrManager( String name ) throws Exception { - OkrUserCache okrUserCache = getOkrUserCacheWithPersonName( name ); - if( okrUserCache != null ){ - return okrUserCache.isOkrManager(); - }else{ - return null; - } - } - - /** - * 获取用户登录的代理身份 - * - * @param name - * @throws Exception - */ - public String getLoginIdentity(String name) throws Exception { - OkrUserCache okrUserCache = getOkrUserCacheWithPersonName( name ); - if( okrUserCache != null ){ - return okrUserCache.getLoginIdentityName(); - }else{ - return null; - } - } - - /** - * 获取用户登录的代理员工姓名 - * - * @param name - * @throws Exception - */ - public String getLoginUserName(String name) throws Exception { - OkrUserCache okrUserCache = getOkrUserCacheWithPersonName( name ); - if( okrUserCache != null ){ - return okrUserCache.getLoginUserName(); - }else{ - return null; - } - } - - /** - * 获取用户登录的代理员工所属组织名称 - * - * @param name - * @throws Exception - */ - public String getLoginUserUnitName(String name) throws Exception { - OkrUserCache okrUserCache = getOkrUserCacheWithPersonName( name ); - if( okrUserCache != null ){ - return okrUserCache.getLoginUserUnitName(); - }else{ - return null; - } - } - - /** - * 获取用户登录的代理员工所属顶层组织名称 - * - * @param name - * @throws Exception - */ - public String getLoginUserTopUnitName(String name) throws Exception { - OkrUserCache okrUserCache = getOkrUserCacheWithPersonName( name ); - if( okrUserCache != null ){ - return okrUserCache.getLoginUserTopUnitName(); - }else{ - return null; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrUserManagerService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrUserManagerService.java deleted file mode 100644 index 3b0db49c90..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrUserManagerService.java +++ /dev/null @@ -1,364 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.organization.Person; -import com.x.base.core.project.organization.Unit; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; - -/** - * 用户组织顶层组织信息管理服务类 - * @author O2LEE - * - */ -public class OkrUserManagerService { - - /** - * 根据员工姓名获取组织名称 - * 如果用户有多个身份，则取组织级别最大的组织名称 - * - * @param personName - * @return - * @throws Exception - */ - public String getUnitNameWithPerson( String personName ) throws Exception { - List unitNames = null; - Business business = null; - Integer level = 0; - String result = null; - Unit unit = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - unitNames = business.organization().unit().listWithPerson( personName ); - if( unitNames != null && !unitNames.isEmpty() ) { - for( String unitName : unitNames ) { - unit = business.organization().unit().getObject( unitName ); - if( level < unit.getLevel() ) { - level = unit.getLevel(); - result = unitName; - } - } - } - } catch ( Exception e ) { - throw e; - } - return result; - } - - /** - * 根据身份名称获取身份所属的组织名称 - * - * @param identity - * @return - * @throws Exception - */ - public String getUnitNameByIdentity( String identity ) throws Exception { - Business business = null; - String unitName = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - unitName = business.organization().unit().getWithIdentity( identity ); - if ( unitName == null ) {// 该根据身份无法查询到组织信息 - return null; - } else { - return unitName; - } - } catch( NullPointerException e ) { - return null; - } catch (Exception e) { - throw e; - } - } - - /** - * 根据身份名称获取身份所属的顶层组织名称 - * - * @param identity - * @return - * @throws Exception - */ - public String getTopUnitNameByIdentity( String identity ) throws Exception { - Business business = null; - String unitName = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - unitName = business.organization().unit().getWithIdentityWithLevel( identity, 1 ); - if ( unitName == null ) { - return null; - } else { - return unitName; - } - } catch( NullPointerException e ) { - return null; - } catch (Exception e) { - throw e; - } - } - - /** - * 根据人员姓名获取人员所属的顶层组织名称，如果人员有多个身份，则取组织等级最大的身份 - * @param personName - * @param level - * @return - * @throws Exception - */ - public String getTopUnitNameWithPerson( String personName ) throws Exception { - String identity = null; - String topUnitName = null; - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - //兼容一下传过来的perosnName有可能是个人，有可能是身份 - personName = business.organization().person().get( personName ); - identity = getIdentityWithPerson( personName ); - if( identity != null && !identity.isEmpty() ){ - topUnitName = business.organization().unit().getWithIdentityWithLevel( identity, 1 ); - } - return topUnitName; - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据个人姓名，根据个人姓名获取所有身份中组织等级最高的一个身份 - * - * @param personName - * @return - * @throws Exception - */ - public String getIdentityWithPerson( String personName ) throws Exception { - List identities = null; - String unitName = null; - Integer level = 0; - String resultIdentity = null; - Unit unit = null; - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - //兼容一下传过来的perosnName有可能是个人，有可能是身份 - personName = business.organization().person().get( personName ); - identities = business.organization().identity().listWithPerson( personName ); - if( identities != null && !identities.isEmpty() ) { - for( String identity : identities ) { - unitName = business.organization().unit().getWithIdentity( identity ); - unit = business.organization().unit().getObject( unitName ); - if( level < unit.getLevel() ) { - level = unit.getLevel(); - resultIdentity = identity; - } - } - } - return resultIdentity; - } catch ( Exception e ) { - throw e; - } - } - - /** - * 查询当前用户是否有指定的身份信息 - * @param name - * @param loginIdentity - * @return - * @throws Exception - */ - public boolean hasIdentity( String personName, String loginIdentity ) throws Exception { - if( loginIdentity == null || loginIdentity.isEmpty() ){ - throw new Exception( "loginIdentity is null!" ); - } - Business business = null; - List identities = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - identities = business.organization().identity().listWithPerson( personName ); -// System.out.println(">>>>>>>>>>>loginIdentity:" + loginIdentity ); -// if( ListTools.isNotEmpty( identities )) { -// for( String identity : identities ) { -// System.out.println(">>>>>>>>>>>identity:" + identity ); -// } -// } - if( identities.contains( loginIdentity )){ - return true; - } - } catch ( Exception e ) { - throw e; - } - return false; - } - - /** - * 根据用户的身份查询用户的姓名 - * @param identity - * @return - * @throws Exception - */ - public String getPersonNameByIdentity( String identity ) throws Exception { - if( identity == null || identity.isEmpty() ){ - throw new Exception( "identity is null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.organization().person().getWithIdentity( identity ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据用户唯一标识来获取用户对象 - * @param flag - * @return - * @throws Exception - */ - public String getPersonNameWithFlag( String flag ) throws Exception { - if( flag == null || flag.isEmpty() ){ - throw new Exception( "flag is null!" ); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.organization().person().get( flag ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 判断用户是否有指定的平台角色，比如CMS系统管理员 - * - * @param name - * @param string - * @return - * @throws Exception - */ - public boolean isHasPlatformRole( String personName, String roleName) throws Exception { - if ( personName == null || personName.isEmpty()) { - throw new Exception("personName is null!"); - } - if (roleName == null || roleName.isEmpty()) { - throw new Exception("roleName is null!"); - } - List roleList = null; - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - roleList = business.organization().role().listWithPerson( personName ); - if (roleList != null && !roleList.isEmpty()) { - if( roleList.stream().filter( r -> roleName.equalsIgnoreCase( r.split("@")[0] )).count() > 0 ){ - return true; - } - } else { - return false; - } - } catch( NullPointerException e ) { - return false; - } catch (Exception e) { - throw e; - } - return false; - } - - /** - * 判断用户是否是系统工作管理员 - * @param userName - * @param roleName - * @return - * @throws Exception - */ - public boolean isOkrWorkManager( String userIdentity ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception( "userIdentity is null!" ); - } - String[] configValues = null; - String configValue = null; - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - configValue = business.okrConfigSystemFactory().getValueWithConfigCode("TOPUNIT_WORK_ADMIN"); - if( configValue != null && !configValue.isEmpty() ){ - configValues = configValue.split( "," ); - for( String identityName : configValues ){ - if( identityName.equalsIgnoreCase( userIdentity )){ - return true; - } - } - }else{ - return false; - } - } catch ( Exception e ) { - throw e; - } - return false; - } - - /** - * - * @param identity - * @return - * @throws Exception - */ - public Boolean isIdentityExsits( String identity ) throws Exception { - if( identity == null || identity.isEmpty() ){ - throw new Exception( "identity is null!" ); - } - Business business = null; - String result = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - result = business.organization().identity().get( identity ); - if( result == null || result.isEmpty() ){ - return false; - }else{ - return true; - } - } catch ( Exception e ) { - throw e; - } - } - - /** - * 获取员工号 - * @param personName - * @return - * @throws Exception - */ - public String getEmployeeNoWithPerson(String personName) throws Exception { - if( personName == null || personName.isEmpty() ){ - throw new Exception( "personName is null!" ); - } - Business business = null; - Person person = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - person = business.organization().person().getObject(personName); - return person.getEmployee(); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 获取Unique - * @param personName - * @return - * @throws Exception - */ - public String getUniqueWithPerson(String personName) throws Exception { - if( personName == null || personName.isEmpty() ){ - throw new Exception( "personName is null!" ); - } - Business business = null; - Person person = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - person = business.organization().person().getObject(personName); - return person.getUnique(); - } catch ( Exception e ) { - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseQueryService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseQueryService.java deleted file mode 100644 index 738ca10da6..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseQueryService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkAppraiseInfo; - -public class OkrWorkAppraiseQueryService { - /** - * 根据指定的ID从数据库查询OkrWorkAppraiseInfo对象 - * - * @param id - * @return - * @throws Exception - */ - public OkrWorkAppraiseInfo get(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null, return null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find(id, OkrWorkAppraiseInfo.class); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据指定的ID列表查询具体工作考核信息列表 - * - * @param ids - * @return - * @throws Exception - */ - public List listByIds(List ids) throws Exception { - if (ids == null || ids.size() == 0) { - return null; - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAppraiseInfoFactory().list(ids); - } catch (Exception e) { - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseSyncService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseSyncService.java deleted file mode 100644 index c7b26b57e5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAppraiseSyncService.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.dataadapter.workflow.WorkComplexGetter; -import com.x.okr.entity.OkrWorkAppraiseInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -public class OkrWorkAppraiseSyncService { - - public void updateAppraiseWfInfo(EffectivePerson effectivePerson, String title, String workId, String wf_jobId, - String wf_workId, String status, WorkComplexGetter.Wo woWorkComplex) throws Exception { - List appraiseIds; - OkrWorkAppraiseInfo appraiseInfo; - Business business; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - OkrWorkBaseInfo workBase = emc.find(workId, OkrWorkBaseInfo.class); - - // 查询该工作所有的考核信息 - appraiseIds = business.okrWorkAppraiseInfoFactory().listIdsWithWorkId(workId, wf_workId); - - if (workBase != null) { - - if (ListTools.isEmpty(workBase.getAppraiseInfoList())) { - workBase.setAppraiseInfoList(new ArrayList<>()); - } - - if (ListTools.isNotEmpty(appraiseIds)) { - appraiseInfo = emc.find(appraiseIds.get(0), OkrWorkAppraiseInfo.class); - } else { - appraiseInfo = new OkrWorkAppraiseInfo(); - appraiseInfo.setId(null); // 先标识一下是新增加的 - } - - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkAppraiseInfo.class); - - // 更新workBase相关流程信息和状态信息 - workBase.setCurrentAppraiseTitle(title); - workBase.setCurrentAppraiseInfoId(appraiseInfo.getId()); - workBase.setCurrentAppraiseJobId(wf_jobId); - workBase.setCurrentAppraiseWorkId(wf_workId); - workBase.setCurrentAppraiseStatus(status); - - appraiseInfo.setTitle(title); - appraiseInfo.setWf_jobId(wf_jobId); - appraiseInfo.setWf_workId(wf_workId); - - appraiseInfo.setCenterId(workBase.getCenterId()); - appraiseInfo.setCenterTitle(workBase.getCenterTitle()); - appraiseInfo.setWorkId(workBase.getId()); - appraiseInfo.setWorkTitle(workBase.getTitle()); - - if (woWorkComplex.getWork() != null) { - if( StringUtils.isEmpty( wf_jobId )) { - workBase.setCurrentAppraiseJobId( woWorkComplex.getWork().getJob() ); - appraiseInfo.setWf_jobId( woWorkComplex.getWork().getJob() ); - } - } - - // 更新当前环节名称信息 - if (woWorkComplex.getWork().getActivityName() != null) { - if ("结束".equals(woWorkComplex.getWork().getActivityName()) - || "已完成".equals(woWorkComplex.getWork().getActivityName())) { - workBase.setCurrentActivityName("结束"); - workBase.setCurrentAppraiseStatus("已完成"); - appraiseInfo.setActivityName("结束"); - appraiseInfo.setStatus("审核完成"); - } else if ("拟稿".equals(woWorkComplex.getWork().getActivityName())) { - workBase.setCurrentActivityName("拟稿"); - workBase.setCurrentAppraiseStatus("审核中"); - appraiseInfo.setActivityName("拟稿"); - appraiseInfo.setStatus("拟稿"); - } else { - workBase.setCurrentActivityName(woWorkComplex.getWork().getActivityName()); - workBase.setCurrentAppraiseStatus("审核中"); - appraiseInfo.setActivityName(woWorkComplex.getWork().getActivityName()); - appraiseInfo.setStatus(woWorkComplex.getWork().getActivityName()); - } - } else { - workBase.setCurrentActivityName("未知状态"); - workBase.setCurrentAppraiseStatus("未知状态"); - appraiseInfo.setActivityName("未知状态"); - appraiseInfo.setStatus("未知状态"); - } - if (StringUtils.isEmpty(appraiseInfo.getId())) { - appraiseInfo.setId(OkrWorkAppraiseInfo.createId()); - workBase.getAppraiseInfoList().add(appraiseInfo.getId()); - emc.persist(appraiseInfo, CheckPersistType.all); - } else { - emc.check(appraiseInfo, CheckPersistType.all); - } - emc.check(workBase, CheckPersistType.all); - emc.commit(); - } - } catch (Exception e) { - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeRecordService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeRecordService.java deleted file mode 100644 index 96fee8e859..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeRecordService.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkAuthorizeRecord; - -/** - * 类 名：OkrWorkAuthorizeRecordService
- * 实体类：OkrWorkAuthorizeRecord
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 - **/ -public class OkrWorkAuthorizeRecordService { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkAuthorizeRecordService.class); - - /** - * 根据传入的ID从数据库查询OkrWorkAuthorizeRecord对象 - * - * @param id - * @return - * @throws Exception - */ - public OkrWorkAuthorizeRecord get(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null, return null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find(id, OkrWorkAuthorizeRecord.class); - } catch (Exception e) { - throw e; - } - } - - /** - * 向数据库保存OkrWorkAuthorizeRecord对象 - * - * @param wrapIn - */ - public OkrWorkAuthorizeRecord save(OkrWorkAuthorizeRecord wrapIn) throws Exception { - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - if (wrapIn.getId() != null && wrapIn.getId().trim().length() > 20) { - // 根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkAuthorizeRecord = emc.find(wrapIn.getId(), OkrWorkAuthorizeRecord.class); - if (okrWorkAuthorizeRecord != null) { - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - wrapIn.copyTo(okrWorkAuthorizeRecord, JpaObject.FieldsUnmodify); - emc.check(okrWorkAuthorizeRecord, CheckPersistType.all); - emc.commit(); - } else { - okrWorkAuthorizeRecord = new OkrWorkAuthorizeRecord(); - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - wrapIn.copyTo(okrWorkAuthorizeRecord); - okrWorkAuthorizeRecord.setId(wrapIn.getId());// 使用参数传入的ID作为记录的ID - emc.persist(okrWorkAuthorizeRecord, CheckPersistType.all); - emc.commit(); - } - } catch (Exception e) { - logger.warn("OkrWorkAuthorizeRecord update/ got a error!"); - throw e; - } - } else {// 没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkAuthorizeRecord = new OkrWorkAuthorizeRecord(); - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - wrapIn.copyTo(okrWorkAuthorizeRecord); - emc.persist(okrWorkAuthorizeRecord, CheckPersistType.all); - emc.commit(); - } catch (Exception e) { - logger.warn("OkrWorkAuthorizeRecord create got a error!", e); - throw e; - } - } - return okrWorkAuthorizeRecord; - } - - /** - * 根据ID从数据库中删除OkrWorkAuthorizeRecord对象 - * - * @param id - * @throws Exception - */ - public void delete(String id) throws Exception { - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - if (id == null || id.isEmpty()) { - throw new Exception("id is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - // 先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkAuthorizeRecord = emc.find(id, OkrWorkAuthorizeRecord.class); - if (null == okrWorkAuthorizeRecord) { - throw new Exception("object is not exist {'id':'" + id + "'}"); - } else { - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - emc.remove(okrWorkAuthorizeRecord, CheckRemoveType.all); - emc.commit(); - } - } catch (Exception e) { - throw e; - } - } - - /** - * 根据【工作授权人】身份获取第一次授权记录信息 - * - * @param workId - * @param authorizeIdentity - * @return - * @throws Exception - */ - public OkrWorkAuthorizeRecord getFirstAuthorizeRecord(String workId, String authorizeIdentity) throws Exception { - Business business = null; - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().getFirstAuthorizeRecord(workId, authorizeIdentity); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据【工作承担人】获取最后的一次授权记录信息 - * - * @param workId - * @param undertakerIdentity - * @return - * @throws Exception - */ - public OkrWorkAuthorizeRecord getLastAuthorizeRecord(String workId, String identity, String status) - throws Exception { - Business business = null; - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().getLastAuthorizeRecord(workId, identity, status); - } catch (Exception e) { - throw e; - } - } - - public List listByAuthorizor(String workId, String authorizeIdentity, Integer delegateLevel) - throws Exception { - Business business = null; - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().listByAuthorizor(workId, authorizeIdentity, delegateLevel); - } catch (Exception e) { - throw e; - } - } - - public List listByWorkId(String id) throws Exception { - Business business = null; - if (id == null || id.isEmpty()) { - throw new Exception("id is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().listByWorkId(id); - } catch (Exception e) { - throw e; - } - } - - public List list(List ids) throws Exception { - Business business = null; - if (ids == null || ids.isEmpty()) { - throw new Exception("ids is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().list(ids); - } catch (Exception e) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeService.java deleted file mode 100644 index b2863738cc..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkAuthorizeService.java +++ /dev/null @@ -1,633 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrWorkAuthorizeService { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkAuthorizeService.class); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private OkrWorkAuthorizeRecordService okrWorkAuthorizeRecordService = new OkrWorkAuthorizeRecordService(); - private DateOperation dateOperation = new DateOperation(); - - /** - * 对工作进行授权操作
- * - * 1、查询授权者在此工作中的所有处理身份信息 workPerson
- * 2、为承担者添加观察者和处理身份相关信息
- * 3、删除授权者在工作所有身份中的除观察者身份之外的所有身份，并且添加授权者身份信息
- * 4、添加工作授权记录信息
- * 5、判断是否需要删除授权者的工作待办，待办所在中心工作中是否还有其他未授权工作需要处理
- * - * @param okrWorkBaseInfo - * 工作信息 - * @param authorizeIdentity - * 授权身份 - * @param undertakerIdentity - * 承担者身份 - * @throws Exception - */ - public void authorize(OkrWorkBaseInfo okrWorkBaseInfo, String authorizeIdentity, String undertakerIdentity, - String delegateOpinion) throws Exception { - if (okrWorkBaseInfo == null) { - throw new Exception("okrWorkBaseInfo is null!"); - } - if (authorizeIdentity == null || authorizeIdentity.isEmpty()) { - throw new Exception("authorizeIdentity is null!"); - } - if (undertakerIdentity == null || undertakerIdentity.isEmpty()) { - throw new Exception("undertakerIdentity is null!"); - } - if (delegateOpinion == null || delegateOpinion.isEmpty()) { - throw new Exception("delegateOpinion is null!"); - } - List statuses = new ArrayList(); - List ids = null; - List ids_task = null; - List ids_tmp = null; - String undertakerName = null; - String undertakerUnitName = null; - String undertakerTopUnitName = null; - String authorizeName = null; - String authorizeUnitName = null; - String authorizeTopUnitName = null; - String authorizeProcessIdentity = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - OkrWorkPerson okrWorkPerson = null; - OkrWorkPerson okrWorkPerson_new = null; - OkrTask okrTask = null; - Integer delegateLevel = 0; - boolean check = true; - Business business = null; - - // 查询工作授权承担人是否存在，并且获取承担人姓名，组织以及顶层组织名称 - undertakerName = okrUserManagerService.getPersonNameByIdentity(undertakerIdentity); - if (undertakerName == null) { - throw new Exception("person{'identity':'" + undertakerIdentity + "'} not exists."); - } - undertakerUnitName = okrUserManagerService.getUnitNameByIdentity(undertakerIdentity); - undertakerTopUnitName = okrUserManagerService.getTopUnitNameByIdentity(undertakerIdentity); - - statuses.add("正常"); - // 根据工作ID查询授权者的工作干系人信息（需要进行授权人身份变更：责任者 -> 授权者 ） - ids = okrWorkPersonService.listIdsByWorkAndUserIdentity(okrWorkBaseInfo.getId(), authorizeIdentity, statuses); - if (ids != null && !ids.isEmpty()) { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - emc.beginTransaction(OkrWorkPerson.class); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrTask.class); - emc.beginTransaction(OkrTaskHandled.class); - - if (check) { - try { - delegateLevel = business.okrWorkAuthorizeRecordFactory() - .getMaxDelegateLevel(okrWorkBaseInfo.getId()); - - okrWorkAuthorizeRecord = new OkrWorkAuthorizeRecord(); - - for (String id : ids) { - - // 遍历授权人在此工作中所有的工作干系人处理身份 - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - - // 判断okrWorkPerson是否为空 - if (okrWorkPerson == null) { - continue; - } - - // 只需要变更责任者身份 为 授权者身份 - if (!"责任者".equals(okrWorkPerson.getProcessIdentity())) { - continue; - } - authorizeName = okrWorkPerson.getEmployeeName(); - authorizeUnitName = okrWorkPerson.getUnitName(); - authorizeTopUnitName = okrWorkPerson.getTopUnitName(); - authorizeProcessIdentity = okrWorkPerson.getProcessIdentity(); - - // 查询授权者在该工作的干系人信息中的授权者身份信息是否已经存在，如果不存在则将当前的身份信息修改为授权信息 - // 如果存在则修改授权记录ID为当前的授权记录ID - ids_tmp = business.okrWorkPersonFactory().listByWorkAndIdentity(null, - okrWorkBaseInfo.getId(), authorizeIdentity, "授权者", statuses); - if (ids_tmp == null || ids_tmp.isEmpty()) { - okrWorkPerson.setProcessIdentity("授权者"); - okrWorkPerson.setAuthorizeRecordId(okrWorkAuthorizeRecord.getId()); - emc.check(okrWorkPerson, CheckPersistType.all); - } else { - logger.warn("授权者已经存在工作处理身份:" + authorizeProcessIdentity); - } - - // 为承担者添加相应的身份信息，先查询该员工在该工作下相应的责任者身份是否已经存在，如果存在，则不需要再添加了 - ids_tmp = business.okrWorkPersonFactory().listByWorkAndIdentity(null, - okrWorkBaseInfo.getId(), undertakerIdentity, authorizeProcessIdentity, statuses); - if (ids_tmp == null || ids_tmp.isEmpty()) { - okrWorkPerson_new = new OkrWorkPerson(); - okrWorkPerson_new.setAuthorizeRecordId(okrWorkAuthorizeRecord.getId()); - okrWorkPerson_new.setCenterId(okrWorkPerson.getCenterId()); - okrWorkPerson_new.setCenterTitle(okrWorkPerson.getCenterTitle()); - okrWorkPerson_new.setWorkId(okrWorkPerson.getWorkId()); - okrWorkPerson_new.setParentWorkId(okrWorkPerson.getParentWorkId()); - okrWorkPerson_new.setWorkTitle(okrWorkPerson.getWorkTitle()); - okrWorkPerson_new.setWorkType(okrWorkPerson.getWorkType()); - okrWorkPerson_new.setWorkDateTimeType(okrWorkPerson.getWorkDateTimeType()); - okrWorkPerson_new.setWorkLevel(okrWorkPerson.getWorkLevel()); - okrWorkPerson_new.setWorkProcessStatus(okrWorkPerson.getWorkProcessStatus()); - okrWorkPerson_new.setEmployeeName(undertakerName); - okrWorkPerson_new.setEmployeeIdentity(undertakerIdentity); - okrWorkPerson_new.setUnitName(undertakerUnitName); - okrWorkPerson_new.setTopUnitName(undertakerTopUnitName); - okrWorkPerson_new.setDeployMonth(okrWorkPerson.getDeployMonth()); - okrWorkPerson_new.setDeployYear(okrWorkPerson.getDeployYear()); - okrWorkPerson_new.setIsCompleted(okrWorkPerson.getIsCompleted()); - okrWorkPerson_new.setIsOverTime(okrWorkPerson.getIsOverTime()); - okrWorkPerson_new.setProcessIdentity(authorizeProcessIdentity); - okrWorkPerson_new.setIsDelegateTarget(true); - emc.persist(okrWorkPerson_new, CheckPersistType.all); - } - - ids_tmp = business.okrWorkPersonFactory().listByWorkAndIdentity(null, - okrWorkBaseInfo.getId(), undertakerIdentity, "观察者", statuses); - if (ids_tmp == null || ids_tmp.isEmpty()) { - okrWorkPerson_new = new OkrWorkPerson(); - okrWorkPerson_new.setAuthorizeRecordId(okrWorkAuthorizeRecord.getId()); - okrWorkPerson_new.setCenterId(okrWorkPerson.getCenterId()); - okrWorkPerson_new.setCenterTitle(okrWorkPerson.getCenterTitle()); - okrWorkPerson_new.setWorkId(okrWorkPerson.getWorkId()); - okrWorkPerson_new.setParentWorkId(okrWorkPerson.getParentWorkId()); - okrWorkPerson_new.setWorkTitle(okrWorkPerson.getWorkTitle()); - okrWorkPerson_new.setWorkType(okrWorkPerson.getWorkType()); - okrWorkPerson_new.setWorkDateTimeType(okrWorkPerson.getWorkDateTimeType()); - okrWorkPerson_new.setWorkLevel(okrWorkPerson.getWorkLevel()); - okrWorkPerson_new.setWorkProcessStatus(okrWorkPerson.getWorkProcessStatus()); - okrWorkPerson_new.setEmployeeName(undertakerName); - okrWorkPerson_new.setEmployeeIdentity(undertakerIdentity); - okrWorkPerson_new.setUnitName(undertakerUnitName); - okrWorkPerson_new.setTopUnitName(undertakerTopUnitName); - okrWorkPerson_new.setDeployMonth(okrWorkPerson.getDeployMonth()); - okrWorkPerson_new.setDeployYear(okrWorkPerson.getDeployYear()); - okrWorkPerson_new.setIsCompleted(okrWorkPerson.getIsCompleted()); - okrWorkPerson_new.setIsOverTime(okrWorkPerson.getIsOverTime()); - okrWorkPerson_new.setProcessIdentity("观察者"); - okrWorkPerson_new.setIsDelegateTarget(true); - okrWorkPerson_new.setRecordType("具体工作"); - okrWorkPerson_new.setDiscription(authorizeIdentity + "进行了工作授权"); - emc.persist(okrWorkPerson_new, CheckPersistType.all); - } - - ids_tmp = business.okrWorkPersonFactory().listIdsForCenterWorkByCenterId( - okrWorkBaseInfo.getCenterId(), undertakerIdentity, "观察者", statuses); - if (ids_tmp == null || ids_tmp.isEmpty()) { - okrWorkPerson_new = new OkrWorkPerson(); - okrWorkPerson_new.setAuthorizeRecordId(okrWorkAuthorizeRecord.getId()); - okrWorkPerson_new.setCenterId(okrWorkPerson.getCenterId()); - okrWorkPerson_new.setCenterTitle(okrWorkPerson.getCenterTitle()); - okrWorkPerson_new.setWorkId(null); - okrWorkPerson_new.setParentWorkId(null); - okrWorkPerson_new.setWorkTitle(null); - okrWorkPerson_new.setWorkType(okrWorkPerson.getWorkType()); - okrWorkPerson_new.setWorkDateTimeType(okrWorkPerson.getWorkDateTimeType()); - okrWorkPerson_new.setWorkLevel(null); - okrWorkPerson_new.setWorkProcessStatus(okrWorkPerson.getWorkProcessStatus()); - okrWorkPerson_new.setEmployeeName(undertakerName); - okrWorkPerson_new.setEmployeeIdentity(undertakerIdentity); - okrWorkPerson_new.setUnitName(undertakerUnitName); - okrWorkPerson_new.setTopUnitName(undertakerTopUnitName); - okrWorkPerson_new.setDeployMonth(okrWorkPerson.getDeployMonth()); - okrWorkPerson_new.setDeployYear(okrWorkPerson.getDeployYear()); - okrWorkPerson_new.setIsCompleted(okrWorkPerson.getIsCompleted()); - okrWorkPerson_new.setIsOverTime(okrWorkPerson.getIsOverTime()); - okrWorkPerson_new.setProcessIdentity("观察者"); - okrWorkPerson_new.setIsDelegateTarget(true); - okrWorkPerson_new.setRecordType("中心工作"); - okrWorkPerson_new.setDiscription(authorizeIdentity + "对中心工作中所负责的工作进行了工作授权"); - emc.persist(okrWorkPerson_new, CheckPersistType.all); - } - } - okrWorkAuthorizeRecord.setCenterId(okrWorkPerson.getCenterId()); - okrWorkAuthorizeRecord.setCenterTitle(okrWorkPerson.getCenterTitle()); - okrWorkAuthorizeRecord.setTitle(okrWorkBaseInfo.getTitle()); - okrWorkAuthorizeRecord.setWorkId(okrWorkBaseInfo.getId()); - okrWorkAuthorizeRecord.setDelegateDateTime(new Date()); - okrWorkAuthorizeRecord.setDelegateDateTimeStr( - dateOperation.getDateStringFromDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - okrWorkAuthorizeRecord.setDelegateOpinion(delegateOpinion); - okrWorkAuthorizeRecord.setDelegatorTopUnitName(authorizeTopUnitName); - okrWorkAuthorizeRecord.setDelegatorIdentity(authorizeIdentity); - okrWorkAuthorizeRecord.setDelegatorName(authorizeName); - okrWorkAuthorizeRecord.setDelegatorUnitName(authorizeUnitName); - okrWorkAuthorizeRecord.setTargetTopUnitName(undertakerTopUnitName); - okrWorkAuthorizeRecord.setTargetIdentity(undertakerIdentity); - okrWorkAuthorizeRecord.setTargetName(undertakerName); - okrWorkAuthorizeRecord.setTargetUnitName(undertakerUnitName); - okrWorkAuthorizeRecord.setDelegateLevel(++delegateLevel); - emc.persist(okrWorkAuthorizeRecord, CheckPersistType.all); - emc.commit(); - } catch (Exception e) { - check = false; - logger.warn("system authorize work got an exception."); - logger.error(e); - } - } - - if (check) {// 重新组织工作的责任者数据 - emc.beginTransaction(OkrWorkBaseInfo.class); - okrWorkBaseInfo = emc.find(okrWorkBaseInfo.getId(), OkrWorkBaseInfo.class); - composeResponsibilityWorkPersonInfo(okrWorkBaseInfo, null, okrWorkBaseInfo.getId(), - undertakerIdentity); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - emc.commit(); - } - - if (check) { - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - emc.beginTransaction(OkrWorkPerson.class); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrTask.class); - emc.beginTransaction(OkrTaskHandled.class); - // 处理待办信息 - // 1、判断承担者是否已经存在该中心工作的待办信息，如果不存在，则需要推送待办信息 - ids_tmp = business.okrTaskFactory().listIdsByCenterAndPerson(okrWorkPerson.getCenterId(), - undertakerIdentity, "中心工作"); - if (ids_tmp == null || ids_tmp.isEmpty()) {// 添加待办信息 - okrTask = new OkrTask(); - okrTask.setTitle(okrWorkPerson.getCenterTitle()); - okrTask.setCenterId(okrWorkPerson.getCenterId()); - okrTask.setCenterTitle(okrWorkPerson.getCenterTitle()); - okrTask.setWorkType(okrWorkPerson.getWorkType()); - okrTask.setTargetIdentity(undertakerIdentity); - okrTask.setTargetName(undertakerName); - okrTask.setTargetUnitName(undertakerUnitName); - okrTask.setTargetTopUnitName(undertakerTopUnitName); - okrTask.setActivityName("工作确认"); - okrTask.setArriveDateTime(new Date()); - okrTask.setArriveDateTimeStr( - dateOperation.getDateStringFromDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - okrTask.setDynamicObjectId(okrWorkPerson.getCenterId()); - okrTask.setDynamicObjectTitle(okrWorkPerson.getCenterTitle()); - okrTask.setDynamicObjectType("中心工作"); - okrTask.setProcessType("TASK"); - okrTask.setStatus("正常"); - okrTask.setViewUrl(""); - emc.persist(okrTask, CheckPersistType.all); - } - - // 先看看该授权者是否仍存在该中心工作的待办，本来就没有待办信息，就不管了 - ids_task = business.okrTaskFactory().listIdsByTargetActivityAndObjId("TASK", "中心工作", - okrWorkBaseInfo.getCenterId(), null, authorizeIdentity); - if (ids_task != null && !ids_task.isEmpty()) { - // for( String _id : ids_task ){ - // okrTask = emc.find( _id, OkrTask.class ); - // if ( okrTask != null ) { - // okrTaskHandled = new OkrTaskHandled(); - // okrTaskHandled.setActivityName(okrTask.getActivityName()); - // okrTaskHandled.setArriveDateTime(okrTask.getArriveDateTime()); - // okrTaskHandled.setArriveDateTimeStr(okrTask.getArriveDateTimeStr()); - // okrTaskHandled.setCenterId(okrTask.getCenterId()); - // okrTaskHandled.setCenterTitle(okrTask.getCenterTitle()); - // okrTaskHandled.setDynamicObjectId(okrTask.getDynamicObjectId()); - // okrTaskHandled.setDynamicObjectTitle(okrTask.getDynamicObjectTitle()); - // okrTaskHandled.setDynamicObjectType(okrTask.getDynamicObjectType()); - // okrTaskHandled.setProcessDateTime(new Date()); - // okrTaskHandled.setProcessDateTimeStr(dateOperation.getNowDateTime()); - // okrTaskHandled.setTargetTopUnitName(okrTask.getTargetTopUnitName()); - // okrTaskHandled.setTargetIdentity(okrTask.getTargetIdentity()); - // okrTaskHandled.setTargetName(okrTask.getTargetName()); - // okrTaskHandled.setTargetUnitName(okrTask.getTargetUnitName()); - // okrTaskHandled.setTitle(okrTask.getTitle()); - // okrTaskHandled.setWorkType( okrTask.getWorkType() ); - // okrTaskHandled.setViewUrl(""); - // okrTaskHandled.setWorkId(okrTask.getWorkId()); - // okrTaskHandled.setWorkTitle(okrTask.getWorkTitle()); - // emc.persist( okrTaskHandled, CheckPersistType.all ); - // break; - // } - // } - // 判断该中心工作下是否仍有授权者需要部署和拆解的工作， workPerson表，有责任者是授权者记录 - ids_tmp = null; - ids_tmp = business.okrWorkPersonFactory().listWorkByCenterAndIdentity( - okrWorkBaseInfo.getCenterId(), authorizeIdentity, "责任者", statuses); - if (ids_tmp == null || ids_tmp.isEmpty()) {// 已经没有需要部署的工作了，需要删除待办并且生成一条已办 - okrTask = emc.find(ids_task.get(0), OkrTask.class); - for (String _id : ids_task) { // 删除所有的待办信息 - okrTask = emc.find(_id, OkrTask.class); - if (okrTask != null) { - emc.remove(okrTask, CheckRemoveType.all); - } - } - } - } - emc.commit(); - } - } catch (Exception e) { - throw e; - } - } - } - - /** - * 授权收回服务 - * - * @param okrWorkBaseInfo - * @param authorizeIdentity - * @throws Exception - */ - public void tackback(OkrWorkBaseInfo okrWorkBaseInfo, String authorizeIdentity) throws Exception { - - if (okrWorkBaseInfo == null) { - throw new Exception("okrWorkBaseInfo is null!"); - } - if (authorizeIdentity == null || authorizeIdentity.isEmpty()) { - throw new Exception("authorizeIdentity is null!"); - } - - Date now = new Date(); - List statuses = new ArrayList(); - List ids = null; - List subWorkIds = null; - List ids_task = null; - List ids_workPerson = null; - OkrWorkBaseInfo okrWorkBaseInfo_sub = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord_tmp = null; - OkrWorkPerson okrWorkPerson = null; - OkrWorkPerson okrWorkPerson_sub = null; - OkrTask okrTask = null; - List responsibilityIdentities = new ArrayList<>(); - Integer delegateLevel = 0; - boolean check = true; - Business business = null; - - statuses.add("正常"); - - okrWorkAuthorizeRecord = okrWorkAuthorizeRecordService.getFirstAuthorizeRecord(okrWorkBaseInfo.getId(), - authorizeIdentity); - if (okrWorkAuthorizeRecord == null) { - check = false; - logger.warn("okrWorkAuthorizeRecord{'workId':'" + okrWorkBaseInfo.getId() + "','delegateIdentity':'" - + authorizeIdentity + "'} not exists。"); - throw new Exception("授权信息不存在，无法进行授权收回操作。"); - } - - if (check) { - delegateLevel = okrWorkAuthorizeRecord.getDelegateLevel(); - try { - ids = okrWorkAuthorizeRecordService.listByAuthorizor(okrWorkBaseInfo.getId(), null, delegateLevel); - } catch (Exception e) { - check = false; - throw e; - } - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - emc.beginTransaction(OkrWorkPerson.class); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrTask.class); - emc.beginTransaction(OkrTaskHandled.class); - if (check) { - if (ids != null && !ids.isEmpty()) { - for (String id : ids) { - okrWorkAuthorizeRecord_tmp = emc.find(id, OkrWorkAuthorizeRecord.class); - if (okrWorkAuthorizeRecord_tmp != null) { - responsibilityIdentities.add(okrWorkAuthorizeRecord_tmp.getTargetIdentity()); - // 如果是最小的那一次,就是最早的一次授权, 则改为已收回，其他因为该授权产生的下级授权修改为已生效 - if (okrWorkAuthorizeRecord_tmp.getId().equalsIgnoreCase(okrWorkAuthorizeRecord.getId())) { - okrWorkAuthorizeRecord_tmp.setTakebackDateTime(now); - okrWorkAuthorizeRecord_tmp.setStatus("已收回"); - } else { - if ("正常".equals(okrWorkAuthorizeRecord_tmp.getStatus())) { - okrWorkAuthorizeRecord_tmp.setTakebackDateTime(now); - okrWorkAuthorizeRecord_tmp.setStatus("已失效"); - } - } - emc.check(okrWorkAuthorizeRecord_tmp, CheckPersistType.all); - } - } - } - } - if (check) { - if (ids != null && !ids.isEmpty()) { - ids_workPerson = okrWorkPersonService.listByAuthorizeRecordIds(ids, statuses); - if (ids_workPerson != null && !ids_workPerson.isEmpty()) { - for (String id : ids_workPerson) { - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - // 删除所有因为授权引起的干系人信息中的所有责任者身份, 保留观察者身份 - if ("责任者".equals(okrWorkPerson.getProcessIdentity())) { - emc.remove(okrWorkPerson, CheckRemoveType.all); - } - if ("授权者".equals(okrWorkPerson.getProcessIdentity())) { - emc.remove(okrWorkPerson, CheckRemoveType.all); - } - } - } - } - } - if (check) { - okrWorkPerson = new OkrWorkPerson(); - okrWorkPerson.setAuthorizeRecordId(okrWorkAuthorizeRecord.getId()); - okrWorkPerson.setCenterId(okrWorkBaseInfo.getCenterId()); - okrWorkPerson.setCenterTitle(okrWorkBaseInfo.getCenterTitle()); - okrWorkPerson.setWorkId(okrWorkBaseInfo.getId()); - okrWorkPerson.setParentWorkId(okrWorkBaseInfo.getParentWorkId()); - okrWorkPerson.setWorkTitle(okrWorkBaseInfo.getTitle()); - okrWorkPerson.setWorkType(okrWorkBaseInfo.getWorkType()); - okrWorkPerson.setWorkDateTimeType(okrWorkBaseInfo.getWorkDateTimeType()); - okrWorkPerson.setWorkLevel(okrWorkBaseInfo.getWorkLevel()); - okrWorkPerson.setWorkProcessStatus(okrWorkBaseInfo.getWorkProcessStatus()); - okrWorkPerson.setEmployeeName(okrWorkAuthorizeRecord.getDelegatorName()); - okrWorkPerson.setEmployeeIdentity(okrWorkAuthorizeRecord.getDelegatorIdentity()); - okrWorkPerson.setUnitName(okrWorkAuthorizeRecord.getDelegatorUnitName()); - okrWorkPerson.setTopUnitName(okrWorkAuthorizeRecord.getDelegatorTopUnitName()); - okrWorkPerson.setDeployMonth(okrWorkBaseInfo.getDeployMonth()); - okrWorkPerson.setDeployYear(okrWorkBaseInfo.getDeployYear()); - - okrWorkPerson.setDeployDateStr(okrWorkBaseInfo.getDeployDateStr()); - if (okrWorkBaseInfo.getCreateTime() != null) { - okrWorkPerson.setWorkCreateDateStr(dateOperation - .getDateStringFromDate(okrWorkBaseInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - } else { - okrWorkPerson.setWorkCreateDateStr( - dateOperation.getDateStringFromDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - } - okrWorkPerson.setCompleteDateLimitStr(okrWorkBaseInfo.getCompleteDateLimitStr()); - okrWorkPerson.setCompleteDateLimit(okrWorkBaseInfo.getCompleteDateLimit()); - okrWorkPerson.setRecordType("具体工作"); - okrWorkPerson.setIsCompleted(okrWorkBaseInfo.getIsCompleted()); - okrWorkPerson.setIsOverTime(okrWorkBaseInfo.getIsOverTime()); - okrWorkPerson.setProcessIdentity("责任者"); - okrWorkPerson.setDiscription("对工作授权收回"); - emc.persist(okrWorkPerson, CheckPersistType.all); - } - if (check) { - // 将该工作所有的下级工作的部署者设置为当前授权收回者身份 - subWorkIds = business.okrWorkBaseInfoFactory().listByParentId(okrWorkBaseInfo.getId()); - if (subWorkIds != null && !subWorkIds.isEmpty()) { - for (String id : subWorkIds) { - // 修改工作干系人中的部署者身份 - ids_workPerson = business.okrWorkPersonFactory() - .listByWorkIdAndProcessIdentity(okrWorkBaseInfo.getId(), "部署者", statuses); - if (ids_workPerson != null && !ids_workPerson.isEmpty()) { - for (String workPersonId : ids_workPerson) { - okrWorkPerson_sub = emc.find(workPersonId, OkrWorkPerson.class); - if (okrWorkPerson_sub != null) { - okrWorkPerson_sub.setEmployeeName(okrWorkAuthorizeRecord.getDelegatorName()); - okrWorkPerson_sub - .setEmployeeIdentity(okrWorkAuthorizeRecord.getDelegatorIdentity()); - okrWorkPerson_sub.setUnitName(okrWorkAuthorizeRecord.getDelegatorUnitName()); - okrWorkPerson_sub.setTopUnitName(okrWorkAuthorizeRecord.getDelegatorTopUnitName()); - emc.check(okrWorkPerson, CheckPersistType.all); - } - } - } - // 修改工作的部署者为当前授权收回者 - okrWorkBaseInfo_sub = emc.find(id, OkrWorkBaseInfo.class); - if (okrWorkBaseInfo_sub != null) { - okrWorkBaseInfo_sub - .setDeployerTopUnitName(okrWorkAuthorizeRecord.getDelegatorTopUnitName()); - okrWorkBaseInfo_sub.setDeployerUnitName(okrWorkAuthorizeRecord.getDelegatorUnitName()); - okrWorkBaseInfo_sub.setDeployerIdentity(okrWorkAuthorizeRecord.getDelegatorIdentity()); - okrWorkBaseInfo_sub.setDeployerName(okrWorkAuthorizeRecord.getDelegatorName()); - emc.check(okrWorkBaseInfo_sub, CheckPersistType.all); - } - } - } - } - // 先提交一次 - if (check) { - emc.commit(); - } - - // 重新组织工作的干系人数据,责任者，更新工作基础信息数据 - if (check) { - emc.beginTransaction(OkrWorkBaseInfo.class); - okrWorkBaseInfo = emc.find(okrWorkBaseInfo.getId(), OkrWorkBaseInfo.class); - composeResponsibilityWorkPersonInfo(okrWorkBaseInfo, null, okrWorkBaseInfo.getId(), - okrWorkAuthorizeRecord.getDelegatorIdentity()); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - emc.commit(); - } - - // 处理待办信息 - if (check) { - emc.beginTransaction(OkrTask.class); - // 为新的责任者新建待办，如果已经存在待办信息，则不需要添加 - ids_task = business.okrTaskFactory().listIdsByCenterAndPerson(okrWorkPerson.getCenterId(), - okrWorkAuthorizeRecord.getDelegatorIdentity(), "中心工作"); - if (ids_task == null || ids_task.isEmpty()) { - // 添加待办信息 - okrTask = new OkrTask(); - okrTask.setTitle(okrWorkPerson.getCenterTitle()); - okrTask.setCenterId(okrWorkPerson.getCenterId()); - okrTask.setCenterTitle(okrWorkPerson.getCenterTitle()); - okrTask.setWorkType(okrWorkPerson.getWorkType()); - okrTask.setTargetIdentity(okrWorkAuthorizeRecord.getDelegatorIdentity()); - okrTask.setTargetName(okrWorkAuthorizeRecord.getDelegatorName()); - okrTask.setTargetUnitName(okrWorkAuthorizeRecord.getDelegatorUnitName()); - okrTask.setTargetTopUnitName(okrWorkAuthorizeRecord.getDelegatorTopUnitName()); - okrTask.setActivityName("工作确认"); - okrTask.setArriveDateTime(new Date()); - okrTask.setArriveDateTimeStr( - dateOperation.getDateStringFromDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - okrTask.setDynamicObjectId(okrWorkPerson.getCenterId()); - okrTask.setDynamicObjectTitle(okrWorkPerson.getCenterTitle()); - okrTask.setDynamicObjectType("中心工作"); - okrTask.setProcessType("TASK"); - okrTask.setStatus("正常"); - okrTask.setViewUrl(""); - emc.persist(okrTask, CheckPersistType.all); - } - - // 删除原责任者的待办，如果没有待办就不需要处理了 - for (String responsibilityIdentity : responsibilityIdentities) { - ids_task = business.okrTaskFactory().listIdsByTargetActivityAndObjId("TASK", "中心工作", - okrWorkBaseInfo.getCenterId(), null, responsibilityIdentity); - if (ids_task != null && !ids_task.isEmpty()) { - // 判断该中心工作下是否仍有授权者需要部署和拆解的工作， - // workPerson表，有责任者是旧授权者oldResponsibilityIdentity的有效记录 - ids_workPerson = business.okrWorkPersonFactory().listWorkByCenterAndIdentity( - okrWorkBaseInfo.getCenterId(), responsibilityIdentity, "责任者", statuses); - if (ids_workPerson == null || ids_workPerson.isEmpty()) {// 已经没有需要部署的工作了 - for (String _id : ids_task) { - okrTask = emc.find(_id, OkrTask.class); - if (okrTask != null) { - emc.remove(okrTask, CheckRemoveType.all); - } - } - } - } - } - emc.commit(); - } - } catch (Exception e) { - check = false; - throw e; - } - } - - private OkrWorkBaseInfo composeResponsibilityWorkPersonInfo(OkrWorkBaseInfo okrWorkBaseInfo, String centerId, - String workId, String employeeIdentity) throws Exception { - OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - String personNames = ""; - String personIdentities = ""; - String personUnitNames = ""; - String personCompanies = ""; - List statuses = new ArrayList(); - List ids_tmp = null; - List okrWorkPersons = null; - - statuses.add("正常"); - ids_tmp = okrWorkPersonService.listByWorkAndIdentity(centerId, workId, employeeIdentity, "责任者", statuses); - if (ids_tmp != null && !ids_tmp.isEmpty()) { - okrWorkPersons = okrWorkPersonService.list(ids_tmp); - } - if (okrWorkPersons != null && !okrWorkPersons.isEmpty()) { - for (OkrWorkPerson okrWorkPerson_tmp : okrWorkPersons) { - if (personNames == null || personNames.trim().isEmpty()) { - personNames = personNames + okrWorkPerson_tmp.getEmployeeName(); - } else { - personNames = "," + personNames + okrWorkPerson_tmp.getEmployeeName(); - } - - if (personIdentities == null || personIdentities.trim().isEmpty()) { - personIdentities = personIdentities + okrWorkPerson_tmp.getEmployeeIdentity(); - } else { - personIdentities = "," + personIdentities + okrWorkPerson_tmp.getEmployeeIdentity(); - } - - if (personUnitNames == null || personUnitNames.trim().isEmpty()) { - personUnitNames = personUnitNames + okrWorkPerson_tmp.getUnitName(); - } else { - personUnitNames = "," + personUnitNames + okrWorkPerson_tmp.getUnitName(); - } - - if (personCompanies == null || personCompanies.trim().isEmpty()) { - personCompanies = personCompanies + okrWorkPerson_tmp.getTopUnitName(); - } else { - personCompanies = "," + personCompanies + okrWorkPerson_tmp.getTopUnitName(); - } - } - okrWorkBaseInfo.setResponsibilityTopUnitName(personCompanies); - okrWorkBaseInfo.setResponsibilityUnitName(personUnitNames); - okrWorkBaseInfo.setResponsibilityIdentity(personIdentities); - okrWorkBaseInfo.setResponsibilityEmployeeName(personNames); - } - return okrWorkBaseInfo; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoDeployService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoDeployService.java deleted file mode 100644 index 377182c25d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoDeployService.java +++ /dev/null @@ -1,473 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrWorkBaseInfoDeployService { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkBaseInfoDeployService.class); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private OkrSendNotifyService okrNotifyService = new OkrSendNotifyService(); - private DateOperation dateOperation = new DateOperation(); - - /** - * 正式部署工作 - * - * @param id - * @param deployerName - * @throws Exception - */ - public void deploy(List workIds, String deployerIdentity) throws Exception { - if (deployerIdentity == null || deployerIdentity.isEmpty()) { - throw new Exception("deployerIdentity is null, can not deploy works。"); - } - // 需要维护工作干系人和工作审核链 - OkrCenterWorkInfo okrCenterWorkInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - if (workIds != null && !workIds.isEmpty()) { - for (String id : workIds) { - logger.info("system deploying work, id:" + id); - okrWorkBaseInfo = emc.find(id, OkrWorkBaseInfo.class); - if (okrWorkBaseInfo != null) { - okrCenterWorkInfo = emc.find(okrWorkBaseInfo.getCenterId(), OkrCenterWorkInfo.class); - if (okrCenterWorkInfo == null) { - throw new Exception( - "okrCenterWorkInfo is not exsits{'id':'" + okrWorkBaseInfo.getCenterId() + "'}."); - } - if (deployWork(emc, okrWorkBaseInfo, okrCenterWorkInfo, deployerIdentity)) { - logger.info("work{'id':'" + id + "' deploy completed. send notify."); - notifyWorkDeployMessage(okrWorkBaseInfo); - } - } - } - } - } catch (Exception e) { - throw e; - } - } - - private Boolean deployWork(EntityManagerContainer emc, OkrWorkBaseInfo okrWorkBaseInfo, - OkrCenterWorkInfo okrCenterWorkInfo, String deployerIdentity) throws Exception { - OkrWorkBaseInfo parentWorkBaseInfo = null; - List ids = null; - List userIdentities = null; - List status = new ArrayList(); - List existsWorkPersonList = null; - List workPersonList = new ArrayList(); - List centerWorkPersonList = new ArrayList(); - List centerWorkPersonListSave = new ArrayList(); - Integer workProcessLevel = 1; - String workProcessStatus = "执行中"; - String reportAuditorIdentity = null; - String topUnitWorkAdmin = null; - OkrWorkPerson workPerson_tmp = null; - Business business = new Business(emc); - - // 从系统设置中查询全局工作管理员身份 - - reportAuditorIdentity = business.okrConfigSystemFactory().getValueWithConfigCode("REPORT_SUPERVISOR"); - topUnitWorkAdmin = business.okrConfigSystemFactory().getValueWithConfigCode("TOPUNIT_WORK_ADMIN"); - - status.add("正常"); - - emc.beginTransaction(OkrCenterWorkInfo.class); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkPerson.class); - - // 根据上级工作的审核层级来确认本工作的审核层级，层级加一 - if (okrWorkBaseInfo.getParentWorkId() != null && !okrWorkBaseInfo.getParentWorkId().isEmpty()) { - parentWorkBaseInfo = emc.find(okrWorkBaseInfo.getParentWorkId(), OkrWorkBaseInfo.class); - if (parentWorkBaseInfo != null) { - workProcessLevel = parentWorkBaseInfo.getWorkAuditLevel() + 1; - okrWorkBaseInfo.setWorkAuditLevel(workProcessLevel); - // 上级工作的观察者作为本级工作的观察者 - userIdentities = business.okrWorkPersonFactory().listUserIndentityByWorkId( - okrWorkBaseInfo.getCenterId(), okrWorkBaseInfo.getParentWorkId(), "观察者", status); - } - } else { - // 无上级工作，中心工作的部署者要作为本级工作的观察者 - // 查询中心工作所有观察者 - userIdentities = business.okrWorkPersonFactory() - .listUserIdentityForCenterWork(okrWorkBaseInfo.getCenterId(), "部署者", status); - } - - // 查询该工作的所有干系人列表，供后续组织列表使用 - ids = business.okrWorkPersonFactory().listByWorkId(okrWorkBaseInfo.getId(), null); - existsWorkPersonList = business.okrWorkPersonFactory().list(ids); - - // 根据工作的情况, 组织所有的工作干系人信息列表(真正需要生效的) - workPersonList = getWorkPersonByWorkInfo(okrWorkBaseInfo, okrCenterWorkInfo, userIdentities, deployerIdentity, - workProcessStatus, reportAuditorIdentity, topUnitWorkAdmin); - - // 查询该‘中心工作’所有的干系人信息 - ids = business.okrWorkPersonFactory().listIdsForCenterWorkByCenterId(okrWorkBaseInfo.getCenterId(), null, null, - null); - centerWorkPersonList = business.okrWorkPersonFactory().list(ids); - for (OkrWorkPerson okrWorkPerson : centerWorkPersonList) { - centerWorkPersonListSave.add(okrWorkPerson); - } - - // 根据所有的工作干系人, 将干系人都组织为中心工作的观察者, 补充观察者 - centerWorkPersonListSave = getCenterWorkPersonByWorkPersonList(workPersonList, centerWorkPersonListSave); - - for (OkrWorkPerson workPerson : existsWorkPersonList) { - workPerson.setWorkProcessStatus(workProcessStatus); - emc.persist(workPerson, CheckPersistType.all); - } - - // 对 centerWorkPersonList 里的中心工作干系人进行存储 - for (OkrWorkPerson workPerson : centerWorkPersonListSave) { - ids = business.okrWorkPersonFactory().listByCenterAndPerson(workPerson.getCenterId(), - workPerson.getEmployeeIdentity(), workPerson.getProcessIdentity(), status); - if (ids == null || ids.isEmpty()) { - workPerson.setWorkProcessStatus(workProcessStatus); - emc.persist(workPerson, CheckPersistType.all); - } else { - for (String id : ids) { - workPerson_tmp = emc.find(id, OkrWorkPerson.class); - if (workPerson_tmp != null) { - workPerson_tmp.setWorkProcessStatus(workProcessStatus); - emc.check(workPerson_tmp, CheckPersistType.all); - } - } - } - } - - // 判断原来的干系人信息里是否存在需要添加的干系人信息,如果存在,则不用添加,将状态标识改为正常 - for (OkrWorkPerson workPerson : workPersonList) { - ids = business.okrWorkPersonFactory().listDistinctWorkIdsByWorkAndIdentity(workPerson.getCenterId(), - workPerson.getWorkId(), workPerson.getEmployeeIdentity(), workPerson.getProcessIdentity(), status); - if (ids == null || ids.isEmpty()) { - workPerson.setWorkProcessStatus(workProcessStatus); - emc.persist(workPerson, CheckPersistType.all); - } else { - for (String id : ids) { - workPerson_tmp = emc.find(id, OkrWorkPerson.class); - if (workPerson_tmp != null) { - workPerson_tmp.setWorkProcessStatus(workProcessStatus); - emc.check(workPerson_tmp, CheckPersistType.all); - } - } - } - } - - // 部署完成后是待员工执行的工作 - okrWorkBaseInfo.setWorkAuditLevel(workProcessLevel); - okrWorkBaseInfo.setWorkProcessStatus(workProcessStatus); - okrWorkBaseInfo.setDeployDateStr(dateOperation.getNowDateTime()); - okrCenterWorkInfo.setProcessStatus(workProcessStatus); - okrCenterWorkInfo.setDeployDateStr(dateOperation.getNowDateTime()); - emc.check(okrCenterWorkInfo, CheckPersistType.all); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - emc.commit(); - return true; - - } - - private List getCenterWorkPersonByWorkPersonList(List workPersonList, - List centerWorkPersonList) throws Exception { - if (centerWorkPersonList == null) { - centerWorkPersonList = new ArrayList<>(); - } - if (workPersonList == null) { - workPersonList = new ArrayList<>(); - } - OkrWorkPerson _workPerson = null; - for (OkrWorkPerson workPerson : workPersonList) { - // 根据工作干系人信息组织一个中心工作干系人信息 - try { - _workPerson = okrWorkPersonService.createCenterWorkPersonByWorkPersonInfo(workPerson, "观察者", - workPerson.getCreateTime()); - if (!exists(_workPerson, centerWorkPersonList)) { - centerWorkPersonList.add(_workPerson); - } - } catch (Exception e) { - throw e; - } - } - return centerWorkPersonList; - } - - /** - * 根据工作和中心工作信息来组织所有的工作干系人信息 - * - * @param okrWorkBaseInfo - * @param okrCenterWorkInfo - * @param deployerIdentity - * @param workProcessStatus - * @param reportAuditorIdentity - * @param topUnitWorkAdmin - * @return - * @throws Exception - */ - private List getWorkPersonByWorkInfo(OkrWorkBaseInfo okrWorkBaseInfo, - OkrCenterWorkInfo okrCenterWorkInfo, List parentWorkWatcherIdentities, String deployerIdentity, - String workProcessStatus, String reportAuditorIdentity, String topUnitWorkAdmin) throws Exception { - List workPersonList = new ArrayList(); - OkrWorkPerson okrWorkPerson = null; - String[] employeeIdentities = null; - String personSplitFlag = ","; - String identity = null; - - // 创建者 - 根据工作信息组织 - if (okrWorkBaseInfo.getCreatorIdentity() != null && !okrWorkBaseInfo.getCreatorIdentity().isEmpty()) { - identity = "创建者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, - okrWorkBaseInfo.getCreatorIdentity(), identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, - okrWorkBaseInfo.getCreatorIdentity(), identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("具体工作创建者"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - - // 部署者 - 根据当前部署者身份组织 - if (okrWorkBaseInfo.getDeployerName() != null && !okrWorkBaseInfo.getDeployerName().isEmpty()) { - identity = "部署者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, - okrWorkBaseInfo.getDeployerIdentity(), identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, - okrWorkBaseInfo.getDeployerIdentity(), identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("具体工作部署者"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - // 责任者 - if (okrWorkBaseInfo.getResponsibilityIdentity() != null - && !okrWorkBaseInfo.getResponsibilityIdentity().isEmpty()) { - // 责任者多个值一般使用“,”分隔 - employeeIdentities = okrWorkBaseInfo.getResponsibilityIdentity().split(personSplitFlag); - if (employeeIdentities != null && employeeIdentities.length > 0) { - for (String identityName : employeeIdentities) { - identity = "责任者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("具体工作责任者"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - } - // 协助者 - if (ListTools.isNotEmpty( okrWorkBaseInfo.getCooperateIdentityList() )) { - for (String identityName : okrWorkBaseInfo.getCooperateIdentityList()) { - identity = "协助者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("具体工作协助者"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - // 工作阅知者 - if (ListTools.isNotEmpty(okrWorkBaseInfo.getReadLeaderIdentityList())) { - for (String identityName : okrWorkBaseInfo.getReadLeaderIdentityList()) { - identity = "阅知者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("具体工作阅知者"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - - // 中心工作阅知领导 -// if (ListTools.isNotEmpty(okrCenterWorkInfo.getAuditLeaderIdentityList() )) { -// for ( String identityName : okrCenterWorkInfo.getAuditLeaderIdentityList() ) { -// identity = "观察者"; -// okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, -// identity); -// if (okrWorkPerson != null) { -// okrWorkPerson.setWorkProcessStatus(workProcessStatus); -// okrWorkPerson.setDiscription("工作所属的中心工作阅知领导"); -// addWorkPersonToList(okrWorkPerson, workPersonList); -// } -// } -// } - - // 中心工作汇报审核领导 - if ( ListTools.isNotEmpty( okrCenterWorkInfo.getReportAuditLeaderIdentityList() )) { - // 工作汇报审批领导多个值一般使用“,”分隔 - for (String identityName : okrCenterWorkInfo.getReportAuditLeaderIdentityList()) { - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("工作所属的中心工作汇报审核领导"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - - // 顶层组织管理员 - if (topUnitWorkAdmin != null && !topUnitWorkAdmin.isEmpty()) { - // 工作管理员多个值一般使用“,”分隔 - employeeIdentities = topUnitWorkAdmin.split(personSplitFlag); - if (employeeIdentities != null && employeeIdentities.length > 0) { - for (String identityName : employeeIdentities) { - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("顶层组织工作管理员"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - } - - // 顶层组织管理员 - if (reportAuditorIdentity != null && !reportAuditorIdentity.isEmpty()) { - // 工作管理员多个值一般使用“,”分隔 - employeeIdentities = reportAuditorIdentity.split(personSplitFlag); - if (employeeIdentities != null && employeeIdentities.length > 0) { - for (String identityName : employeeIdentities) { - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("工作汇报督办员"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - } - - // 上级工作的观察者 parentWorkWatcherIdentities - // 上级工作的观察者作为本级工作的观察者，如果无上级工作，则中心工作的部署者要作为本级工作的观察者 - if (parentWorkWatcherIdentities != null && !parentWorkWatcherIdentities.isEmpty()) { - for (String identityName : parentWorkWatcherIdentities) { - identity = "观察者"; - okrWorkPerson = okrWorkPersonService.createWorkPersonByWorkInfo(okrWorkBaseInfo, identityName, - identity); - if (okrWorkPerson != null) { - okrWorkPerson.setWorkProcessStatus(workProcessStatus); - okrWorkPerson.setDiscription("继承自工作所属的上级工作观察者"); - addWorkPersonToList(okrWorkPerson, workPersonList); - } - } - } - return workPersonList; - } - - private void addWorkPersonToList(OkrWorkPerson okrWorkPerson, List workPersonList) { - if (workPersonList == null) { - workPersonList = new ArrayList<>(); - } - if (!exists(okrWorkPerson, workPersonList)) { - workPersonList.add(okrWorkPerson); - } - } - - private Boolean exists(OkrWorkPerson okrWorkPerson, List workPersonList) { - for (OkrWorkPerson _okrWorkPerson : workPersonList) { - if (isSameWorkPersonInfo(okrWorkPerson, _okrWorkPerson)) { - return true; - } - } - return false; - } - - private Boolean isSameWorkPersonInfo(OkrWorkPerson okrWorkPerson, OkrWorkPerson _okrWorkPerson) { - if (_okrWorkPerson.getCenterId().equalsIgnoreCase(okrWorkPerson.getCenterId()) - && _okrWorkPerson.getEmployeeIdentity().equalsIgnoreCase(okrWorkPerson.getEmployeeIdentity()) - && _okrWorkPerson.getProcessIdentity().equalsIgnoreCase(okrWorkPerson.getProcessIdentity())) { - if ((okrWorkPerson.getWorkId() == null || okrWorkPerson.getWorkId().isEmpty()) - && (_okrWorkPerson.getWorkId() == null || _okrWorkPerson.getWorkId().isEmpty())) {// 如果是中心工作 - return true; - } else {// 如果是具体工作 - if (okrWorkPerson.getWorkId() != null && _okrWorkPerson.getWorkId() != null - && !_okrWorkPerson.getWorkId().isEmpty() - && _okrWorkPerson.getWorkId().equalsIgnoreCase(okrWorkPerson.getWorkId())) { - return true; - } - } - } - return false; - } - - /** - * 工作部署成功，进行工作消息通知 - * - * @param okrWorkBaseInfo - */ - private void notifyWorkDeployMessage(OkrWorkBaseInfo okrWorkBaseInfo) { - // 工作部署成功，通知部署者 - try { - okrNotifyService.notifyDeployerForWorkDeploySuccess(okrWorkBaseInfo); - } catch (Exception e) { - logger.warn("工作[" + okrWorkBaseInfo.getTitle() + "]部署成功，通知部署者发生异常！"); - logger.error(e); - } - // 收到一个新工作，通知责任者 - try { - okrNotifyService.notifyResponsibilityForGetWork(okrWorkBaseInfo); - } catch (Exception e) { - logger.warn("工作[" + okrWorkBaseInfo.getTitle() + "]部署成功，通知责任者发生异常！"); - logger.error(e); - } - // 收到一个新工作，通知协助者 - try { - okrNotifyService.notifyCooperaterForGetWork(okrWorkBaseInfo); - } catch (Exception e) { - logger.warn("工作[" + okrWorkBaseInfo.getTitle() + "]部署成功，通知协助者发生异常！"); - logger.error(e); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteArchive.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteArchive.java deleted file mode 100644 index de1ab41677..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteArchive.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.ThisApplication; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDetailInfo; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class OkrWorkBaseInfoExcuteArchive { - private OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - private OkrStatisticReportStatusService okrStatisticReportStatusService = new OkrStatisticReportStatusService(); - - /** - * 根据ID从归档OkrWorkBaseInfo对象 - * 同时归档所有的下级工作以及工作的相关汇报，请示等等 - * 并且删除所有待办 - * @param id - * @throws Exception - */ - public void excute( EntityManagerContainer emc, String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not archive any object." ); - } - List ids = null; - List statisticIds = null; - List del_attachmentIds = new ArrayList(); - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrAttachmentFileInfo attachment = null; - StorageMapping mapping = null; - List okrWorkDetailInfoList = null; - List okrWorkPersonList = null; - List okrWorkReportBaseInfoList = null; - List okrWorkReportDetailInfoList = null; - List okrWorkReportPersonLinkList = null; - List okrWorkReportProcessLogList = null; - List okrWorkDynamicsList = null; - List okrWorkAuthorizeRecordList = null; - List okrTaskList = null; - List statisticList = null; - OkrStatisticReportContent okrStatisticReportContent = null; - Business business = new Business(emc); - - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class ); - emc.beginTransaction( OkrWorkDetailInfo.class ); - emc.beginTransaction( OkrWorkPerson.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - emc.beginTransaction( OkrWorkChat.class ); - emc.beginTransaction( OkrWorkDynamics.class ); - emc.beginTransaction( OkrWorkAuthorizeRecord.class ); - emc.beginTransaction( OkrStatisticReportContent.class ); - emc.beginTransaction( OkrStatisticReportStatus.class ); - - okrWorkBaseInfo = emc.find( workId, OkrWorkBaseInfo.class ); - if( okrWorkBaseInfo != null ){ - if( "草稿".equals( okrWorkBaseInfo.getWorkProcessStatus() )){ - //如果归档时仍是草稿，则直接删除，不必保留 - if( okrWorkBaseInfo.getAttachmentList() != null && !okrWorkBaseInfo.getAttachmentList().isEmpty() ){ - for( String id : okrWorkBaseInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrWorkBaseInfo, CheckRemoveType.all ); - }else{ - okrWorkBaseInfo.setStatus( "已归档" ); - okrWorkBaseInfo.setArchiveDate( new Date() ); - emc.check( okrWorkBaseInfo, CheckPersistType.all ); - } - - //归档统计数据 - statisticIds = business.okrStatisticReportContentFactory().list( workId, null, null, null, null ); - if (statisticIds != null && statisticIds.size() > 0) { - for ( String statisticId : statisticIds) { - okrStatisticReportContent = emc.find( statisticId, OkrStatisticReportContent.class); - if ( okrStatisticReportContent != null) { - okrStatisticReportContent.setStatus("已归档"); - emc.check( okrStatisticReportContent, CheckPersistType.all); - } - } - } - statisticList = okrStatisticReportStatusService.list( null, null, workId, null, null, null, null ); - if( statisticList != null && !statisticList.isEmpty() ){ - for( OkrStatisticReportStatus statistic : statisticList ){ - statistic.setStatus( "已归档" ); - emc.check( statistic, CheckPersistType.all ); - } - } - } - - ids = business.okrWorkReportPersonLinkFactory().listByWorkId(workId); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list(ids); - for( OkrWorkReportPersonLink okrWorkReportPersonLink : okrWorkReportPersonLinkList ){ - if( okrWorkReportPersonLink != null ){ - if( "草稿".equals( okrWorkReportPersonLink.getProcessStatus() )){ - emc.remove( okrWorkReportPersonLink, CheckRemoveType.all ); - }else{ - okrWorkReportPersonLink.setStatus( "已归档" ); - emc.check( okrWorkReportPersonLink, CheckPersistType.all ); - } - } - } - } - ids = business.okrWorkReportBaseInfoFactory().listByWorkId(workId); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportBaseInfoList = business.okrWorkReportBaseInfoFactory().list(ids); - for( OkrWorkReportBaseInfo okrWorkReportBaseInfo : okrWorkReportBaseInfoList ){ - if( okrWorkReportBaseInfo != null ){ - if( "草稿".equals( okrWorkReportBaseInfo.getProcessStatus() )){ - if( okrWorkReportBaseInfo.getAttachmentList() != null && !okrWorkReportBaseInfo.getAttachmentList().isEmpty() ){ - for( String id : okrWorkReportBaseInfo.getAttachmentList() ){ - del_attachmentIds.add( id ); - } - } - emc.remove( okrWorkReportBaseInfo, CheckRemoveType.all ); - }else{ - okrWorkReportBaseInfo.setStatus( "已归档" ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - } - } - } - } - - ids = business.okrWorkReportProcessLogFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportProcessLogList = business.okrWorkReportProcessLogFactory().list(ids); - for( OkrWorkReportProcessLog okrWorkReportProcessLog : okrWorkReportProcessLogList ){ - if( okrWorkReportProcessLog != null ){ - okrWorkReportProcessLog.setStatus( "已归档" ); - emc.check( okrWorkReportProcessLog, CheckPersistType.all ); - } - } - } - ids = business.okrWorkReportDetailInfoFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkReportDetailInfoList = business.okrWorkReportDetailInfoFactory().list(ids); - for( OkrWorkReportDetailInfo okrWorkReportDetailInfo : okrWorkReportDetailInfoList ){ - if( okrWorkReportDetailInfo != null ){ - okrWorkReportDetailInfo.setStatus( "已归档" ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - } - } - } - ids = business.okrWorkPersonFactory().listByWorkId( workId, null ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkPersonList = business.okrWorkPersonFactory().list(ids); - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - if( okrWorkPerson != null ){ - okrWorkPerson.setStatus( "已归档" ); - emc.check( okrWorkPerson, CheckPersistType.all ); - } - } - } - ids = business.okrWorkDetailInfoFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkDetailInfoList = business.okrWorkDetailInfoFactory().list(ids); - for( OkrWorkDetailInfo okrWorkDetailInfo : okrWorkDetailInfoList ){ - if( okrWorkDetailInfo != null ){ - okrWorkDetailInfo.setStatus( "已归档" ); - emc.check( okrWorkDetailInfo, CheckPersistType.all ); - } - } - } - ids = business.okrWorkAuthorizeRecordFactory().listByWorkId(workId); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkAuthorizeRecordList = business.okrWorkAuthorizeRecordFactory().list(ids); - for( OkrWorkAuthorizeRecord okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList ){ - if( okrWorkAuthorizeRecord != null ){ - okrWorkAuthorizeRecord.setStatus( "已归档" ); - emc.check( okrWorkAuthorizeRecord, CheckPersistType.all ); - } - } - } - ids = business.okrWorkDynamicsFactory().listByWorkId(workId); - if( ListTools.isNotEmpty( ids ) ){ - okrWorkDynamicsList = business.okrWorkDynamicsFactory().list(ids); - for( OkrWorkDynamics okrWorkDynamics : okrWorkDynamicsList ){ - if( okrWorkDynamics != null ){ - okrWorkDynamics.setStatus( "已归档" ); - emc.check( okrWorkDynamics, CheckPersistType.all ); - } - } - } - - ids = business.okrTaskFactory().listByWorkId(workId); - List taskIdentityInfoList = new ArrayList<>(); - if( ListTools.isNotEmpty( ids ) ){ - okrTaskList = business.okrTaskFactory().list(ids); - for( OkrTask okrTask : okrTaskList ){ - if( okrTask != null ){ - emc.remove( okrTask, CheckRemoveType.all ); - if ("工作汇报".equals(okrTask.getDynamicObjectType())) { - taskIdentityInfoList = putTaskIdentityInfoToList( okrTask.getTargetIdentity(), okrTask.getWorkType(), taskIdentityInfoList ); - } - } - } - } - if( del_attachmentIds != null && !del_attachmentIds.isEmpty() ){ - for( String id : del_attachmentIds ){ - attachment = emc.find( id, OkrAttachmentFileInfo.class ); - if( attachment != null ){ - mapping = ThisApplication.context().storageMappings().get(OkrAttachmentFileInfo.class, attachment.getStorage() ); - attachment.deleteContent( mapping ); - emc.remove( attachment, CheckRemoveType.all ); - } - } - } - emc.commit(); - - if( ListTools.isNotEmpty( taskIdentityInfoList )) { - for( TaskIdentityInfo _taskIdentityInfo : taskIdentityInfoList ) { - try { - okrWorkReportTaskCollectService.checkReportCollectTask(_taskIdentityInfo.getIdentity(), _taskIdentityInfo.getWorkTypeList()); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - - private List putTaskIdentityInfoToList(String targetIdentity, String workType, List taskIdentityInfoList) { - if( taskIdentityInfoList == null ) { - taskIdentityInfoList = new ArrayList<>(); - } - Boolean exists = false; - for( TaskIdentityInfo taskIdentityInfo : taskIdentityInfoList ) { - if( taskIdentityInfo.getIdentity().equals( targetIdentity )) { - exists = true; - if( taskIdentityInfo.getWorkTypeList() == null ) { - taskIdentityInfo.setWorkTypeList( new ArrayList<>()); - } - if( !taskIdentityInfo.getWorkTypeList().contains( workType )) { - taskIdentityInfo.getWorkTypeList().add( workType ); - } - } - } - if( !exists ) { - List _workTypeList = new ArrayList<>(); - _workTypeList.add( workType ); - TaskIdentityInfo _taskIdentityInfo = new TaskIdentityInfo(targetIdentity, _workTypeList); - taskIdentityInfoList.add( _taskIdentityInfo ); - } - return taskIdentityInfoList; - } - - public class TaskIdentityInfo{ - private String identity = null; - private List workTypeList = null; - public String getIdentity() { - return identity; - } - public List getWorkTypeList() { - return workTypeList; - } - public void setIdentity(String identity) { - this.identity = identity; - } - public void setWorkTypeList(List workTypeList) { - this.workTypeList = workTypeList; - } - public TaskIdentityInfo(String identity, List workTypeList) { - super(); - this.identity = identity; - this.workTypeList = workTypeList; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteProgressAdjust.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteProgressAdjust.java deleted file mode 100644 index f1e33ff16c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoExcuteProgressAdjust.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -/** - * 工作进展情况调整 - * - */ -public class OkrWorkBaseInfoExcuteProgressAdjust { - - - /** - * 根据ID修改工作进展情况，同时修改最后一次生效的汇报进度 - * - * @param workId - * @param percent - * - * @throws Exception - */ - public void excute( EntityManagerContainer emc, String workId, Integer percent ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not archive any object." ); - } - if( percent == null ){ - percent = 0; - } - List ids = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - List okrWorkPersonList = null; - Business business = new Business(emc); - - emc.beginTransaction( OkrWorkBaseInfo.class ); - emc.beginTransaction( OkrWorkPerson.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - - okrWorkBaseInfo = emc.find( workId, OkrWorkBaseInfo.class ); - - if( okrWorkBaseInfo != null ){ - okrWorkReportBaseInfo = business.okrWorkReportBaseInfoFactory().getLastCompletedReport( workId ); - - if( !"草稿".equals( okrWorkBaseInfo.getWorkProcessStatus() )){ - if( percent == 100 ){ - okrWorkBaseInfo.setCompleteTime( new Date() ); - okrWorkBaseInfo.setIsCompleted( true ); - okrWorkBaseInfo.setOverallProgress( percent ); - okrWorkBaseInfo.setWorkProcessStatus( "已完成" ); - if( okrWorkReportBaseInfo != null ){ - okrWorkReportBaseInfo.setProgressPercent( percent ); - okrWorkReportBaseInfo.setIsWorkCompleted( true ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - } - }else{ - okrWorkBaseInfo.setIsCompleted( false ); - okrWorkBaseInfo.setOverallProgress( percent ); - okrWorkBaseInfo.setWorkProcessStatus( "执行中" ); - if( okrWorkReportBaseInfo != null ){ - okrWorkReportBaseInfo.setProgressPercent( percent ); - okrWorkReportBaseInfo.setIsWorkCompleted( false ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - } - } - emc.check( okrWorkBaseInfo, CheckPersistType.all ); - } - } - - ids = business.okrWorkPersonFactory().listByWorkId( workId, null ); - if( ids != null && ids.size() > 0 ){ - okrWorkPersonList = business.okrWorkPersonFactory().list(ids); - for( OkrWorkPerson okrWorkPerson : okrWorkPersonList ){ - if( okrWorkPerson != null ){ - okrWorkPerson.setStatus( "正常" ); - if( percent == 100 ){ - okrWorkPerson.setIsCompleted( true ); - okrWorkPerson.setWorkProcessStatus( "已完成" ); - }else{ - okrWorkPerson.setIsCompleted( false ); - okrWorkPerson.setWorkProcessStatus( "执行中" ); - } - emc.check( okrWorkPerson, CheckPersistType.all ); - } - } - } - - emc.commit(); - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoOperationService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoOperationService.java deleted file mode 100644 index 07cb154c33..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoOperationService.java +++ /dev/null @@ -1,1178 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDetailInfo; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class OkrWorkBaseInfoOperationService { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkBaseInfoOperationService.class); - private OkrWorkBaseInfoExcuteArchive okrWorkBaseInfoExcuteArchive = new OkrWorkBaseInfoExcuteArchive(); - private OkrWorkBaseInfoExcuteProgressAdjust okrWorkBaseInfoExcuteProgressAdjust = new OkrWorkBaseInfoExcuteProgressAdjust(); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private OkrSendNotifyService okrNotifyService = new OkrSendNotifyService(); - private OkrStatisticReportStatusService okrStatisticReportStatusService = new OkrStatisticReportStatusService(); - private OkrTaskService okrTaskService = new OkrTaskService(); - - /** - * - * 向数据库保存OkrWorkBaseInfo对象, 第一次保存或者是继续拆解工作 - * - * @param wrapIn - * @param workDetail - * @param dutyDescription - * @param landmarkDescription - * @param majorIssuesDescription - * @param progressAction - * @param progressPlan - * @param resultDescription - * @return - * @throws Exception - */ - public OkrWorkBaseInfo save(OkrWorkBaseInfo wrapIn, String workDetail, String dutyDescription, - String landmarkDescription, String majorIssuesDescription, String progressAction, String progressPlan, - String resultDescription) throws Exception { - OkrWorkPerson okrWorkPerson_tmp = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - List okrWorkPersonList = null; - List ids = null; - List statuses = new ArrayList(); - Business business = null; - int shortChartCount = 30; - statuses.add("正常"); - - // 根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkDetailInfo.class); - emc.beginTransaction(OkrWorkPerson.class); - - if (StringUtils.isNotEmpty( wrapIn.getId() )) { - okrWorkBaseInfo = emc.find(wrapIn.getId(), OkrWorkBaseInfo.class); // 查询基础信息 - okrWorkDetailInfo = emc.find(wrapIn.getId(), OkrWorkDetailInfo.class); // 查询详细信息 - } - // 保存工作基础内容 - if (okrWorkBaseInfo == null) { - okrWorkBaseInfo = new OkrWorkBaseInfo(); - - wrapIn.copyTo(okrWorkBaseInfo); - - okrWorkBaseInfo.setId(wrapIn.getId());// 使用参数传入的ID作为记录的ID - if (workDetail != null && workDetail.length() > shortChartCount) { - okrWorkBaseInfo.setTitle(workDetail.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setTitle(workDetail); - } - if (workDetail != null && workDetail.length() > shortChartCount) { - okrWorkBaseInfo.setShortWorkDetail(workDetail.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortWorkDetail(workDetail); - } - if (dutyDescription != null && dutyDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortDutyDescription(dutyDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortDutyDescription(dutyDescription); - } - if (landmarkDescription != null && landmarkDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortLandmarkDescription(landmarkDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortLandmarkDescription(landmarkDescription); - } - if (majorIssuesDescription != null && majorIssuesDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortMajorIssuesDescription(majorIssuesDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortMajorIssuesDescription(majorIssuesDescription); - } - if (progressAction != null && progressAction.length() > shortChartCount) { - okrWorkBaseInfo.setShortProgressAction(progressAction.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortProgressAction(progressAction); - } - if (progressPlan != null && progressPlan.length() > shortChartCount) { - okrWorkBaseInfo.setShortProgressPlan(progressPlan.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortProgressPlan(progressPlan); - } - if (resultDescription != null && resultDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortResultDescription(resultDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortResultDescription(resultDescription); - } - okrWorkBaseInfo.setUpdateTime(okrWorkBaseInfo.getCreateTime()); - emc.persist(okrWorkBaseInfo, CheckPersistType.all); - } else {// 更新 - //附件信息 - - List attachmemnts = okrWorkBaseInfo.getAttachmentList(); - - wrapIn.copyTo( okrWorkBaseInfo, JpaObject.FieldsUnmodify ); - okrWorkBaseInfo.setAttachmentList(attachmemnts); - - if (workDetail != null && workDetail.length() > shortChartCount) { - okrWorkBaseInfo.setTitle(workDetail.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setTitle(workDetail); - } - if (workDetail != null && workDetail.length() > shortChartCount) { - okrWorkBaseInfo.setShortWorkDetail(workDetail.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortWorkDetail(workDetail); - } - if (dutyDescription != null && dutyDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortDutyDescription(dutyDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortDutyDescription(dutyDescription); - } - if (landmarkDescription != null && landmarkDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortLandmarkDescription(landmarkDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortLandmarkDescription(landmarkDescription); - } - if (majorIssuesDescription != null && majorIssuesDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortMajorIssuesDescription(majorIssuesDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortMajorIssuesDescription(majorIssuesDescription); - } - if (progressAction != null && progressAction.length() > shortChartCount) { - okrWorkBaseInfo.setShortProgressAction(progressAction.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortProgressAction(progressAction); - } - if (progressPlan != null && progressPlan.length() > shortChartCount) { - okrWorkBaseInfo.setShortProgressPlan(progressPlan.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortProgressPlan(progressPlan); - } - if (resultDescription != null && resultDescription.length() > shortChartCount) { - okrWorkBaseInfo.setShortResultDescription(resultDescription.substring(0, shortChartCount) + "..."); - } else { - okrWorkBaseInfo.setShortResultDescription(resultDescription); - } - emc.check(okrWorkBaseInfo, CheckPersistType.all); - } - - // 保存详细信息数据 - if (okrWorkDetailInfo == null) { - okrWorkDetailInfo = new OkrWorkDetailInfo(); - okrWorkDetailInfo.setId(wrapIn.getId()); // 详细信息的ID与工作基础信息ID一致 - okrWorkDetailInfo.setCenterId(wrapIn.getCenterId()); - okrWorkDetailInfo.setWorkDetail(workDetail); - okrWorkDetailInfo.setDutyDescription(dutyDescription); - okrWorkDetailInfo.setLandmarkDescription(landmarkDescription); - okrWorkDetailInfo.setMajorIssuesDescription(majorIssuesDescription); - okrWorkDetailInfo.setProgressAction(progressAction); - okrWorkDetailInfo.setProgressPlan(progressPlan); - okrWorkDetailInfo.setResultDescription(resultDescription); - okrWorkDetailInfo.setUpdateTime(okrWorkDetailInfo.getCreateTime()); - emc.persist(okrWorkDetailInfo, CheckPersistType.all); - } else {// 更新 - okrWorkDetailInfo.setCenterId(wrapIn.getCenterId()); - okrWorkDetailInfo.setWorkDetail(workDetail); - okrWorkDetailInfo.setDutyDescription(dutyDescription); - okrWorkDetailInfo.setLandmarkDescription(landmarkDescription); - okrWorkDetailInfo.setMajorIssuesDescription(majorIssuesDescription); - okrWorkDetailInfo.setProgressAction(progressAction); - okrWorkDetailInfo.setProgressPlan(progressPlan); - okrWorkDetailInfo.setResultDescription(resultDescription); - emc.check(okrWorkDetailInfo, CheckPersistType.all); - } - // 保存工作的干系人信息，先根据工作基础信息来获取工作所有的干系人对象信息 - okrWorkPersonList = okrWorkPersonService.getWorkPersonListByWorkBaseInfoForWorkSave(okrWorkBaseInfo); - if (okrWorkPersonList != null && okrWorkPersonList.size() > 0) { - for (OkrWorkPerson okrWorkPerson : okrWorkPersonList) { - ids = business.okrWorkPersonFactory().listByWorkAndIdentity(okrWorkPerson.getCenterId(), - okrWorkPerson.getWorkId(), okrWorkPerson.getEmployeeIdentity(), - okrWorkPerson.getProcessIdentity(), statuses); - if (ids != null && ids.size() > 0) { - for (String id : ids) { - okrWorkPerson_tmp = emc.find(id, OkrWorkPerson.class); - if (okrWorkPerson_tmp != null) { - emc.remove(okrWorkPerson_tmp); - } - } - } - okrWorkPerson.setUpdateTime(okrWorkPerson.getCreateTime()); - emc.persist(okrWorkPerson, CheckPersistType.all); - } - } - emc.commit(); - } catch (Exception e) { - logger.warn("OkrWorkBaseInfo update/save get a error!"); - throw e; - } - return okrWorkBaseInfo; - } - - /** - * 强制撤回，不管有没有下级工作信息，根据ID从撤回所有的工作以及全部下级工作 - * - * @param id - * @throws Exception - */ - public void recycleWorkForce(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null, system can not recycle any object."); - } - List ids = getSubNormalWorkBaseInfoIds(id); - if (ids != null && ids.size() > 0) { - for (String workid : ids) { - recycleWorkForce(workid);// 处理这个工作的下级工作，完成后再处理该工作 - recycleWork(workid); - } - } else { - // 已经没有下级工作了，可以进行撤回 - recycleWork(id); - } - } - - /** - * 收回已经部署的工作，如果要收回的工作已经被拆解到下级工作，则不允许收回 收回工作，其实就是将工作置为已撤回，汇报信息，以及问题请示都不需要变更 - * - * @param id - * @throws Exception - */ - public void recycleWork(String workId) throws Exception { - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - List subWorkIds = null; - List taskIds = null; - List ids = null; - String[] userIdentityArray = null; - OkrTask okrTask = null; - - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not delete any object."); - } - subWorkIds = getSubNormalWorkBaseInfoIds(workId); - if (subWorkIds != null && subWorkIds.size() > 0) { - throw new Exception("该工作存在" + subWorkIds.size() + "个下级工作，该工作暂无法收回。"); - } else {// 工作可以被撤消 - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - // 先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkBaseInfo = emc.find(workId, OkrWorkBaseInfo.class); - okrWorkDetailInfo = emc.find(workId, OkrWorkDetailInfo.class); - - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkDetailInfo.class); - - if (okrWorkBaseInfo != null) { - okrWorkBaseInfo.setStatus("已撤回"); - emc.check(okrWorkBaseInfo, CheckRemoveType.all); - } else { - logger.warn("can not recycle work, okrWorkBaseInfo is not exist {'id':'" + workId + "'}"); - } - - if (okrWorkDetailInfo != null) { - okrWorkDetailInfo.setStatus("已撤回"); - emc.check(okrWorkDetailInfo, CheckRemoveType.all); - } else { - logger.warn("can not recycle work, okrWorkDetailInfo is not exist {'id':'" + workId + "'}"); - } - - if (okrWorkBaseInfo.getResponsibilityEmployeeName() != null - && !okrWorkBaseInfo.getResponsibilityEmployeeName().isEmpty()) { - userIdentityArray = okrWorkBaseInfo.getResponsibilityEmployeeName().split(","); - for (String identity : userIdentityArray) { - // 对待办数据进行处理 - taskIds = okrTaskService.listIdsByCenterAndPerson(okrWorkBaseInfo.getCenterId(), identity, - "中心工作"); - // 查询该工作的负责人是否有待办信息 - if (taskIds != null && taskIds.size() > 0) { - // 是否在此中心工作下仍有需要确认和部署的工作 - ids = listUnConfirmWorkIdsByCenterAndPerson(okrWorkBaseInfo.getCenterId(), identity); - if (ids == null || ids.size() == 0) { - // 删除待办信息 - for (String taskId : taskIds) { - okrTask = emc.find(taskId, OkrTask.class); - if (okrTask != null) { - emc.remove(okrTask); - } - } - } - } - } - } - - if (ListTools.isNotEmpty( okrWorkBaseInfo.getCooperateIdentityList())) { - for (String identity : okrWorkBaseInfo.getCooperateIdentityList()) { - // 对待办数据进行处理 - taskIds = okrTaskService.listIdsByCenterAndPerson(okrWorkBaseInfo.getCenterId(), identity, "中心工作"); - // 查询该工作的协助人是否有待阅信息 - if (taskIds != null && taskIds.size() > 0) { - // 是否在此中心工作下仍有需要确认和部署的工作 - ids = listUnConfirmWorkIdsByCenterAndPerson(okrWorkBaseInfo.getCenterId(), identity); - if (ids == null || ids.size() == 0) { - // 删除待办信息 - for (String taskId : taskIds) { - okrTask = emc.find(taskId, OkrTask.class); - if (okrTask != null) { - emc.remove(okrTask); - } - } - } - } - } - } - - if (ListTools.isNotEmpty( okrWorkBaseInfo.getReadLeaderIdentityList() )) { - for (String identity : okrWorkBaseInfo.getReadLeaderIdentityList()) { - // 对待办数据进行处理 - taskIds = okrTaskService.listIdsByCenterAndPerson(okrWorkBaseInfo.getCenterId(), identity, "中心工作"); - // 查询该工作的阅知人是否有待阅信息 - if (taskIds != null && taskIds.size() > 0) { - // 是否在此中心工作下仍有需要确认和部署的工作 - ids = listUnConfirmWorkIdsByCenterAndPerson(okrWorkBaseInfo.getCenterId(), identity); - if (ids == null || ids.size() == 0) { - // 删除待办信息 - for (String taskId : taskIds) { - okrTask = emc.find(taskId, OkrTask.class); - if (okrTask != null) { - emc.remove(okrTask); - } - } - } - } - } - } - - emc.commit(); - // 向工作相关干系人发送消息 - notityRecycleMessage(okrWorkBaseInfo); - - } catch (Exception e) { - throw e; - } - } - } - - /** - * 强制删除，不管有没有下级工作信息，根据ID从数据库中删除OkrWorkBaseInfo对象 递归删除 - * - * @param id - * @throws Exception - */ - public void deleteForce(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null, system can not delete any object."); - } - List ids = getSubNormalWorkBaseInfoIds(id); - if (ids != null && ids.size() > 0) { - for (String workid : ids) { - deleteForce(workid); - // deleteByWorkId( workid ); - } - } else { - // 已经没有下级工作了，可以进行删除 - deleteByWorkId(id); - } - } - - /** - * 删除工作信息，如果有下级信息则无法进行删除 - * - * @param id - * @throws Exception - */ - public void deleteByWorkId(String workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not delete any object."); - } - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkDetailInfo okrWorkDetailInfo = null; - List subWorkIds = null; - List ids = null; - List ids_work = null; - List st_ids = null; - OkrStatisticReportStatus okrStatisticReportStatus = null; - List statuses = new ArrayList(); - OkrTask okrTask = null; - Business business = null; - boolean excuteSuccess = true; // 判断执行是否正常 - statuses.add("正常"); - - subWorkIds = getSubNormalWorkBaseInfoIds(workId); - if (subWorkIds != null && subWorkIds.size() > 0) { - throw new Exception("该工作存在" + subWorkIds.size() + "个下级工作，该工作暂无法删除。"); - } else {// 工作可以被删除 - // logger.debug( "开始删除工作......" ); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - // 先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - // 删除时详细信息也一并删除，还有所有的下级工作，汇报，请示，人员，审批信息等等 - if (excuteSuccess) { - try { - okrWorkBaseInfo = emc.find(workId, OkrWorkBaseInfo.class); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system find okrWorkBaseInfo by workid got an exception, workid:" + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - okrWorkDetailInfo = emc.find(workId, OkrWorkDetailInfo.class); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system find okrWorkBaseInfo by workid got an exception, workid:" + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - // 删除工作以及工作相关信息 - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkDetailInfo.class); - emc.beginTransaction(OkrWorkPerson.class); - emc.beginTransaction(OkrWorkReportBaseInfo.class); - emc.beginTransaction(OkrWorkReportDetailInfo.class); - emc.beginTransaction(OkrWorkReportPersonLink.class); - emc.beginTransaction(OkrWorkReportProcessLog.class); - emc.beginTransaction(OkrTask.class); - emc.beginTransaction(OkrTaskHandled.class); - emc.beginTransaction(OkrWorkDynamics.class); - emc.beginTransaction(OkrWorkAuthorizeRecord.class); - emc.beginTransaction(OkrWorkChat.class); - emc.beginTransaction(OkrStatisticReportStatus.class); - } - - if (excuteSuccess) { - try { - deleteWorkReportByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkReportByWorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteWorkReportDetailByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkReportDetailByWorkId got an exception, workid:" - + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteWorkReportPersonByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkReportPersonByWorkId got an exception, workid:" - + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteWorkReportProcessLogByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkReportProcessLogByWorkId got an exception, workid:" - + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteWorkPersonByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkPersonByWorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteWorkAuthorizeRecordByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkAuthorizeRecordByWorkId got an exception, workid:" - + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteWorkChatByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteWorkChatByWorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteTaskByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system excute method deleteTaskByWorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - - if (excuteSuccess) { - try { - deleteTaskHandledByWorkId(workId, emc, true); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn( - "system excute method deleteTaskHandledByWorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - if (excuteSuccess) { - st_ids = okrStatisticReportStatusService.listIds(null, workId, null, null, null); - if (st_ids != null && !st_ids.isEmpty()) { - for (String st_id : st_ids) { - okrStatisticReportStatus = emc.find(st_id, OkrStatisticReportStatus.class); - if (okrStatisticReportStatus != null) { - emc.remove(okrStatisticReportStatus, CheckRemoveType.all); - } - } - } - } - if (excuteSuccess) { - try { - emc.remove(okrWorkBaseInfo, CheckRemoveType.all); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system delete okrWorkBaseInfo By WorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - if (excuteSuccess) { - try { - emc.remove(okrWorkDetailInfo, CheckRemoveType.all); - } catch (Exception e1) { - excuteSuccess = false; - logger.warn("system delete okrWorkDetailInfo By WorkId got an exception, workid:" + workId); - logger.error(e1); - } - } - - // 不应该删除 - // deleteWorkDynamicsByWorkId( workId, emc, realDelete ); - - if (excuteSuccess) { - emc.commit(); - } else { - emc.rollback(); - } - - if (excuteSuccess) { - emc.beginTransaction(OkrTask.class); - emc.beginTransaction(OkrTaskHandled.class); - - // 如果责任人在该中心工作下面没有其他需要负责的工作了，那么需要删除该责任人中心工作的待办 - if (okrWorkBaseInfo.getResponsibilityIdentity() != null) { - String[] responsibilityIdentities = okrWorkBaseInfo.getResponsibilityIdentity().split(","); - for (String responsibilityIdentitiy : responsibilityIdentities) { - // 待办删除的功能先不管，用户可以主动提交后删除 - // 先看看该授权者是否仍存在该中心工作的待办，本来就没有待办信息，就不管了 - ids = business.okrTaskFactory().listIdsByTargetActivityAndObjId("TASK", "中心工作", - okrWorkBaseInfo.getCenterId(), null, responsibilityIdentitiy); - if (ids != null && !ids.isEmpty()) { - // 判断该中心工作下是否仍有授权者需要部署和拆解的工作， - // workPerson表，有责任者是授权者记录 - ids_work = business.okrWorkPersonFactory().listWorkByCenterAndIdentity( - okrWorkBaseInfo.getCenterId(), responsibilityIdentitiy, "责任者", statuses); - if (ids_work == null || ids_work.isEmpty()) {// 已经没有需要部署的工作了，需要删除待办并且生成一条已办 - // 删除所有的待办信息 - for (String _id : ids) { - okrTask = emc.find(_id, OkrTask.class); - if (okrTask != null) { - emc.remove(okrTask, CheckRemoveType.all); - } - } - } - } - } - } - } - - if (excuteSuccess) { - emc.commit(); - } else { - emc.rollback(); - } - - if (excuteSuccess) { - notityDeleteMessage(okrWorkBaseInfo); - } - - } catch (Exception e) { - throw e; - } - } - } - - /** - * 根据工作信息ID删除所有汇报信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkReportByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkReportBaseInfoList = null; - List ids = business.okrWorkReportBaseInfoFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkReportBaseInfoList = business.okrWorkReportBaseInfoFactory().list(ids); - for (OkrWorkReportBaseInfo okrWorkReportBaseInfo : okrWorkReportBaseInfoList) { - if (realDelete) { - emc.remove(okrWorkReportBaseInfo, CheckRemoveType.all); - } else { - okrWorkReportBaseInfo.setStatus("已删除"); - emc.check(okrWorkReportBaseInfo, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 根据工作信息ID删除所有工作动态信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkDynamicsByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkDynamicsList = null; - List ids = business.okrWorkDynamicsFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkDynamicsList = business.okrWorkDynamicsFactory().list(ids); - for (OkrWorkDynamics okrWorkDynamics : okrWorkDynamicsList) { - if (realDelete) { - emc.remove(okrWorkDynamics, CheckRemoveType.all); - } else { - okrWorkDynamics.setStatus("已删除"); - emc.check(okrWorkDynamics, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 根据工作信息ID删除所有工作交流信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkChatByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkChatList = null; - List ids = business.okrWorkChatFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkChatList = business.okrWorkChatFactory().list(ids); - for (OkrWorkChat _okrWorkChat : okrWorkChatList) { - emc.remove(_okrWorkChat, CheckRemoveType.all); - } - } - return true; - } - - /** - * 根据工作信息ID删除所有工作待办信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteTaskByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) throws Exception { - Business business = new Business(emc); - List okrTaskList = null; - List ids = business.okrTaskFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrTaskList = business.okrTaskFactory().list(ids); - for (OkrTask _okrTask : okrTaskList) { - emc.remove(_okrTask, CheckRemoveType.all); - } - } - return true; - } - - /** - * 根据工作信息ID删除所有工作已办办信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteTaskHandledByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrTaskHandledList = null; - List ids = business.okrTaskHandledFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrTaskHandledList = business.okrTaskHandledFactory().list(ids); - for (OkrTaskHandled _okrTaskHandled : okrTaskHandledList) { - emc.remove(_okrTaskHandled, CheckRemoveType.all); - } - } - return true; - } - - /** - * 根据工作信息ID删除所有工作授权信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkAuthorizeRecordByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkAuthorizeRecordList = null; - List ids = business.okrWorkAuthorizeRecordFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkAuthorizeRecordList = business.okrWorkAuthorizeRecordFactory().list(ids); - for (OkrWorkAuthorizeRecord okrWorkAuthorizeRecord : okrWorkAuthorizeRecordList) { - if (realDelete) { - emc.remove(okrWorkAuthorizeRecord, CheckRemoveType.all); - } else { - okrWorkAuthorizeRecord.setStatus("已删除"); - emc.check(okrWorkAuthorizeRecord, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 根据工作信息ID删除所有工作干系人信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkPersonByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkPersonList = null; - List ids = business.okrWorkPersonFactory().listByWorkId(workId, null); - if (ids != null && ids.size() > 0) { - okrWorkPersonList = business.okrWorkPersonFactory().list(ids); - for (OkrWorkPerson okrWorkPerson : okrWorkPersonList) { - if (realDelete) { - emc.remove(okrWorkPerson, CheckRemoveType.all); - } else { - okrWorkPerson.setStatus("已删除"); - emc.check(okrWorkPerson, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 根据工作信息ID删除所有汇报处理日志信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkReportProcessLogByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkReportProcessLogList = null; - List ids = business.okrWorkReportProcessLogFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkReportProcessLogList = business.okrWorkReportProcessLogFactory().list(ids); - for (OkrWorkReportProcessLog okrWorkReportProcessLog : okrWorkReportProcessLogList) { - if (realDelete) { - emc.remove(okrWorkReportProcessLog, CheckRemoveType.all); - } else { - okrWorkReportProcessLog.setStatus("已删除"); - emc.check(okrWorkReportProcessLog, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 根据工作信息ID删除所有汇报处理人信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkReportPersonByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkReportPersonLinkList = null; - List ids = business.okrWorkReportPersonLinkFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list(ids); - for (OkrWorkReportPersonLink okrWorkReportPersonLink : okrWorkReportPersonLinkList) { - if (realDelete) { - emc.remove(okrWorkReportPersonLink, CheckRemoveType.all); - } else { - okrWorkReportPersonLink.setStatus("已删除"); - emc.check(okrWorkReportPersonLink, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 根据工作信息ID删除所有汇报详细信息 - * - * @param workId - * 工作ID - * @param emc - * 数据源 - * @param realDelete - * 是否真正删除 - * @return - * @throws Exception - */ - public boolean deleteWorkReportDetailByWorkId(String workId, EntityManagerContainer emc, boolean realDelete) - throws Exception { - Business business = new Business(emc); - List okrWorkReportDetailInfoList = null; - List ids = business.okrWorkReportDetailInfoFactory().listByWorkId(workId); - if (ids != null && ids.size() > 0) { - okrWorkReportDetailInfoList = business.okrWorkReportDetailInfoFactory().list(ids); - for (OkrWorkReportDetailInfo okrWorkReportDetailInfo : okrWorkReportDetailInfoList) { - if (realDelete) { - emc.remove(okrWorkReportDetailInfo, CheckRemoveType.all); - } else { - okrWorkReportDetailInfo.setStatus("已删除"); - emc.check(okrWorkReportDetailInfo, CheckPersistType.all); - } - } - } - return true; - } - - /** - * 发送消息通知 - * - * @param okrWorkBaseInfo - */ - private void notityDeleteMessage(OkrWorkBaseInfo okrWorkBaseInfo) { - try { - okrNotifyService.notifyCooperaterForWorkDeleted(okrWorkBaseInfo); - } catch (Exception e) { - logger.warn("工作删除成功，向协助者发送消息通知发生异常！"); - logger.error(e); - } - try { - okrNotifyService.notifyDeployerForWorkDeletedSuccess(okrWorkBaseInfo); - } catch (Exception e) { - logger.warn("工作删除成功，向部署者发送消息通知发生异常！"); - logger.error(e); - } - try { - okrNotifyService.notifyResponsibilityForWorkDeleted(okrWorkBaseInfo); - } catch (Exception e) { - logger.warn("工作删除成功，向责任者发送消息通知发生异常！"); - logger.error(e); - } - } - - /** - * 发送消息通知 - * - * @param okrWorkBaseInfo - */ - private void notityRecycleMessage(OkrWorkBaseInfo okrWorkBaseInfo) { - // try { - // okrNotifyService.notifyCooperaterForWorkRecycled(okrWorkBaseInfo); - // } catch (Exception e) { - // logger.error( "工作撤消成功，向协助者发送消息通知发生异常！", e ); - // } - // try { - // okrNotifyService.notifyDeployerForWorkRecycleSuccess(okrWorkBaseInfo); - // } catch (Exception e) { - // logger.error( "工作撤消成功，向部署者发送消息通知发生异常！", e ); - // } - // try { - // okrNotifyService.notifyResponsibilityForWorkRecycled(okrWorkBaseInfo); - // } catch (Exception e) { - // logger.error( "工作撤消成功，向责任者发送消息通知发生异常！", e ); - // } - } - - /** - * 根据工作ID，获取指定工作的所有下级工作ID列表 - * - * @param id - * @return - * @throws Exception - */ - private List getSubNormalWorkBaseInfoIds(String workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, return null!"); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getSubNormalWorkBaseInfoIds(workId); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据中心工作ID和指定处理人查询是否存在未确认和未拆分并且状态正常的工作基础信息存在，查询ID列表 - * - * @param centerId - * @param responsibilityEmployeeName - * @return - * @throws Exception - */ - private List listUnConfirmWorkIdsByCenterAndPerson(String centerId, String userIdentity) throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception("centerId is null, system can not query!"); - } - if (userIdentity == null || userIdentity.isEmpty()) { - throw new Exception("userNameString is null, system can not query!"); - } - Business business = null; - List ids = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - // 先查询中心工作ID和处理人查询与其有关的所有工作ID - ids = business.okrWorkPersonFactory().listByCenterAndPerson(centerId, userIdentity, null, null); - // 在IDS范围内，查询所有状态正常并且待确认的工作 - ids = business.okrWorkBaseInfoFactory().listUnConfirmWorkIdInIds(ids); - return ids; - } catch (Exception e) { - throw e; - } - } - - /** - * 生成待办信息 - * - * @param okrWorkBaseInfo - */ - public void createTasks(List workIds, String userIdentity) throws Exception { - String splitFlag = ","; - OkrCenterWorkInfo okrCenterWorkInfo = null; - List okrWorkBaseInfoList = null; - List taskUserIdentityList = new ArrayList(); - List centerWorkIds = new ArrayList<>(); - String[] targetIdentityArray = null; - String targetIdentities = null; - - if (workIds != null && !workIds.isEmpty()) { - okrWorkBaseInfoList = listByIds(workIds); - } - - // 生成新的待办信息 - if (okrWorkBaseInfoList != null && okrWorkBaseInfoList.size() > 0) { - for (OkrWorkBaseInfo okrWorkBaseInfo : okrWorkBaseInfoList) { - if (!centerWorkIds.contains(okrWorkBaseInfo.getCenterId())) { - centerWorkIds.add(okrWorkBaseInfo.getCenterId()); - } - // 责任者，需要生成待办，有可能多人 - targetIdentities = okrWorkBaseInfo.getResponsibilityIdentity(); - if (targetIdentities != null && !targetIdentities.isEmpty()) { - targetIdentityArray = targetIdentities.split(splitFlag); - if (targetIdentityArray != null && targetIdentityArray.length > 0) { - for (String identity : targetIdentityArray) { - if (!taskUserIdentityList.contains(identity)) { - taskUserIdentityList.add(identity); - } - } - } - } else { - throw new Exception("getResponsibilityIdentity is null, can not create tasks!"); - } - } - } - if (centerWorkIds != null && !centerWorkIds.isEmpty()) { - for (String centerId : centerWorkIds) { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkInfo = emc.find(centerId, OkrCenterWorkInfo.class); - } catch (Exception e) { - logger.warn("okrCenterWorkInfo{'id':'" + centerId + "'} is not exsits!"); - logger.error(e); - } - if (okrCenterWorkInfo != null) { - // 删除当前处理人的待办信息，并且创建已办信息 - okrTaskService.deleteTask(okrCenterWorkInfo, userIdentity); - // 为责任者生成工作确认的待办信息 - if (taskUserIdentityList != null && !taskUserIdentityList.isEmpty()) { - // logger.debug( "责任者:" + taskUserNameList ); - okrTaskService.createTaskProcessors(okrCenterWorkInfo, taskUserIdentityList); - } - } - } - } - } - - /** - * 根据指定的ID列表查询具体工作信息列表 - * - * @param ids - * @return - * @throws Exception - */ - private List listByIds(List ids) throws Exception { - if (ids == null || ids.size() == 0) { - return null; - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().list(ids); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据ID从归档OkrWorkBaseInfo对象 同时归档所有的下级工作以及工作的相关汇报，请示等等 并且删除所有待办 - * - * @param id - * @throws Exception - */ - public void archive(String workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not archive any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkBaseInfoExcuteArchive.excute(emc, workId); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据ID修改工作进展情况，同时修改最后一次生效的汇报进度 - * - * @param workId - * @param percent - * - * @throws Exception - */ - public void progressAdjust(String workId, Integer percent) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not adjust progress."); - } - if (percent == null) { - throw new Exception("percent is null, system can not adjust progress."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkBaseInfoExcuteProgressAdjust.excute(emc, workId, percent); - } catch (Exception e) { - throw e; - } - } - - public void updateWorkReportTime(String workId, Date nextReportTime, String reportTimeQue) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, system can not update reportTime for work."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - OkrWorkBaseInfo okrWorkBaseInfo = emc.find(workId, OkrWorkBaseInfo.class); - if (okrWorkBaseInfo != null) { - emc.beginTransaction(OkrWorkBaseInfo.class); - okrWorkBaseInfo.setNextReportTime(nextReportTime); - okrWorkBaseInfo.setReportTimeQue(reportTimeQue); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - emc.commit(); - } else { - throw new Exception("work is not exists."); - } - } catch (Exception e) { - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoQueryService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoQueryService.java deleted file mode 100644 index 5523635859..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoQueryService.java +++ /dev/null @@ -1,1072 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.WorkCommonSearchFilter; -import com.x.okr.assemble.control.jaxrs.okrworkbaseinfo.WrapInFilter; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -public class OkrWorkBaseInfoQueryService { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkBaseInfoQueryService.class); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private DateOperation dateOperation = new DateOperation(); - - /** - * 根据指定的ID从数据库查询OkrWorkBaseInfo对象 - * - * @param id - * @return - * @throws Exception - */ - public OkrWorkBaseInfo get(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null, return null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find(id, OkrWorkBaseInfo.class); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据指定的ID列表查询具体工作信息列表 - * - * @param ids - * @return - * @throws Exception - */ - public List listByIds(List ids) throws Exception { - if (ids == null || ids.size() == 0) { - return null; - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().list(ids); - } catch (Exception e) { - throw e; - } - } - - /** - * 权限校验，判断用户是否有权限拆解工作 - * - * @param workId - * -- 被拆解工作的ID - * @param userName - * -- 操作的用户姓名 - * @return - * @throws Exception - */ - public boolean canDismantlingWorkByIdentity(String workId, String userIdentity) throws Exception { - /** - * 1、判断用户是否是该工作的责任者，责任者可以进行工作拆解 - */ - // 先根据工作的ID，用户的姓名，身份（责任者），查询工作的干系人信息，如果有，则可以进行部署 - Business business = null; - List ids = null; - List statuses = new ArrayList(); - statuses.add("正常"); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - ids = business.okrWorkPersonFactory().listByWorkAndIdentity(null, workId, userIdentity, "责任者", statuses); - } catch (Exception e) { - throw e; - } - if (ids != null && ids.size() > 0) { - return true; - } - return false; - } - - /** - * 查询下一页的信息数据，直接调用Factory里的方法 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listNextWithFilter(String id, Integer count, WrapInFilter wrapIn) throws Exception { - Business business = null; - Object sequence = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if (id != null && !"(0)".equals(id) && id.trim().length() > 20) { - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty(emc.find(id, OkrWorkBaseInfo.class), JpaObject.sequence_FIELDNAME); - } - } - return business.okrWorkBaseInfoFactory().listNextWithFilter(id, count, sequence, wrapIn); - } catch (Exception e) { - throw e; - } - } - - /** - * 查询上一页的信息数据，直接调用Factory里的方法 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listPrevWithFilter(String id, Integer count, WrapInFilter wrapIn) throws Exception { - Business business = null; - Object sequence = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if (id != null && !"(0)".equals(id) && id.trim().length() > 20) { - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty(emc.find(id, OkrWorkBaseInfo.class), JpaObject.sequence_FIELDNAME); - } - } - return business.okrWorkBaseInfoFactory().listPrevWithFilter(id, count, sequence, wrapIn); - } catch (Exception e) { - throw e; - } - } - - /** - * 查询符合条件的数据总数 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getCountWithFilter(WrapInFilter wrapIn) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getCountWithFilter(wrapIn); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据部署日期，完成时限，汇报周期，汇报日期计算在工作执行期间所有的汇报日期列表 - * - * @param deployDateStr - * @param completeDateLimitStr - * @param reportCycle - * @param reportDayInCycle - * @return - * @throws Exception - */ - public String getReportTimeQue(Date deployDate, Date completeDateLimit, String reportCycle, - Integer reportDayInCycle, String createTime) throws Exception { - List dateStringList = new ArrayList(); - StringBuffer sb = new StringBuffer(); - Calendar calendar = Calendar.getInstance(); - Date _tmp_date = null; - if (reportCycle != null && reportCycle.trim().equals("每月汇报")) { - int reportDay = 0; - int dayMaxNumber = 0; - calendar.setTime(deployDate); - _tmp_date = calendar.getTime(); - do { - dayMaxNumber = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - if (dayMaxNumber < reportDayInCycle) { - reportDay = dayMaxNumber; - } else { - reportDay = reportDayInCycle; - } - calendar.set(Calendar.DAY_OF_MONTH, reportDay); - // 判断是否周末, 汇报会跳过周末，顺延到下一个工作日 - while (dateOperation.isWeekend(calendar.getTime())) { - calendar.add(Calendar.DATE, 1); - } - - if (calendar.getTime().after(deployDate)) { - dateStringList.add( - dateOperation.getDateStringFromDate(calendar.getTime(), "yyyy-MM-dd") + " " + createTime); - } - - // 判断是否节假日 - calendar.add(Calendar.MONTH, 1); - _tmp_date = calendar.getTime(); - } while (_tmp_date.before(completeDateLimit)); - } else if (reportCycle != null && reportCycle.trim().equals("每周汇报")) { - int reportDay = 0; - int dayMaxNumber = 7; // 1-SUNDAY, 2-MONDAY, 3-TUESDAY, 4-WENDSDAY, 5-THURSDAY, 6-FRIDAY, 7-SATURDAY - calendar.setTime(deployDate); - _tmp_date = calendar.getTime(); - do { - if (dayMaxNumber < reportDayInCycle) { - reportDay = dayMaxNumber; - } else { - reportDay = reportDayInCycle; - } - calendar.set(Calendar.DAY_OF_WEEK, reportDay); - - // 判断是否周末, 汇报会跳过周末，顺延到下一个工作日 - while (dateOperation.isWeekend(calendar.getTime())) { - calendar.add(Calendar.DATE, 1); - } - - if (calendar.getTime().after(deployDate)) { - dateStringList.add( - dateOperation.getDateStringFromDate(calendar.getTime(), "yyyy-MM-dd") + " " + createTime); - } - - // 判断是否节假日 - calendar.add(Calendar.WEEK_OF_YEAR, 1); - _tmp_date = calendar.getTime(); - - } while (_tmp_date.before(completeDateLimit)); - } - - if (dateStringList != null && dateStringList.size() > 0) { - for (String dateString : dateStringList) { - if (sb.toString().trim().length() > 0) { - sb.append(";" + dateString); - } else { - sb.append(dateString); - } - } - } - return sb.toString(); - } - - /** - * 根据定期汇报时间序列和上一次汇报时间来获取下一次汇报时间 - * - * @param reportTimeQue - * @param lastReportTime - * @return - * @throws Exception - */ - public Date getNextReportTime(String reportTimeQue, Date lastReportTime) throws Exception { - String[] timeArray = null; - if (reportTimeQue != null && reportTimeQue.trim().length() > 0) { - timeArray = reportTimeQue.split(";"); - if (timeArray != null && timeArray.length > 0) { - for (String reportTime : timeArray) { - // 在现在之后，并且在上一次汇报时间之后 - if (dateOperation.getDateFromString(reportTime).after(new Date())) { - if (lastReportTime == null) { - return dateOperation.getDateFromString(reportTime); - } else { - if (dateOperation.getDateFromString(reportTime).after(lastReportTime)) { - return dateOperation.getDateFromString(reportTime); - } - } - } - } - } - } - return null; - } - - /** - * 根据用户名称和中心工作ID列示所有工作信息 - * - * @param centerId - * @param statuses - * 需要显示的信息状态：正常|已删除 - * @return - * @throws Exception - */ - public List listWorkInCenter(String centerId, List statuses) throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception("centerId is null."); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listWorkByCenterId(centerId, null, statuses); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据用户名称和中心工作ID列示所有与用户有关的工作信息 - * - * @param userIdentity - * @param centerId - * @param statuses - * 需要显示的信息状态：正常|已删除 - * @return - * @throws Exception - */ - public List listWorkInCenterByIdentity(String userIdentity, String centerId, List statuses) - throws Exception { - if (centerId == null || centerId.isEmpty()) { - throw new Exception("centerId is null."); - } - Business business = null; - List ids = okrWorkPersonService.listDistinctWorkIdsByIdentity(userIdentity, centerId, statuses); - if (ids != null && !ids.isEmpty()) { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().list(ids); - } catch (Exception e) { - throw e; - } - } - return null; - } - - /** - * 查询下一页的信息数据，直接调用Factory里的方法 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listWorkNextWithFilter(String id, Integer count, WorkCommonSearchFilter wrapIn) - throws Exception { - Business business = null; - Object sequence = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - List okrWorkBaseInfoList = new ArrayList(); - List okrWorkPersonList = null; - if (wrapIn == null) { - throw new Exception("wrapIn is null!"); - } - wrapIn.setInfoType("WORK"); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if (id != null && !"(0)".equals(id) && id.trim().length() > 20) { - okrWorkPersonList = business.okrWorkPersonFactory().listDetailWorkPerson(id, wrapIn); - if (okrWorkPersonList != null && !okrWorkPersonList.isEmpty()) { - sequence = okrWorkPersonList.get(0).getSequence(); - } - } - okrWorkPersonList = business.okrWorkPersonFactory().listNextWithFilter(id, count, sequence, wrapIn); - if (okrWorkPersonList != null && !okrWorkPersonList.isEmpty()) { - for (OkrWorkPerson okrWorkPerson : okrWorkPersonList) { - okrWorkBaseInfo = emc.find(okrWorkPerson.getWorkId(), OkrWorkBaseInfo.class); - if (okrWorkBaseInfo != null && !okrWorkBaseInfoList.contains(okrWorkBaseInfo)) { - okrWorkBaseInfoList.add(okrWorkBaseInfo); - } - } - } - } catch (Exception e) { - throw e; - } - return okrWorkBaseInfoList; - } - - /** - * 查询上一页的信息数据，直接调用Factory里的方法 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listWorkPrevWithFilter(String id, Integer count, WorkCommonSearchFilter wrapIn) - throws Exception { - Business business = null; - Object sequence = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - List okrWorkBaseInfoList = new ArrayList(); - List okrWorkPersonList = null; - if (wrapIn == null) { - throw new Exception("wrapIn is null!"); - } - wrapIn.setInfoType("WORK"); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if (id != null && !"(0)".equals(id) && id.trim().length() > 20) { - okrWorkPersonList = business.okrWorkPersonFactory().listDetailWorkPerson(id, wrapIn); - if (okrWorkPersonList != null && !okrWorkPersonList.isEmpty()) { - sequence = okrWorkPersonList.get(0).getSequence(); - } - } - okrWorkPersonList = business.okrWorkPersonFactory().listPrevWithFilter(id, count, sequence, wrapIn); - if (okrWorkPersonList != null && !okrWorkPersonList.isEmpty()) { - for (OkrWorkPerson okrWorkPerson : okrWorkPersonList) { - okrWorkBaseInfo = emc.find(okrWorkPerson.getCenterId(), OkrWorkBaseInfo.class); - if (okrWorkBaseInfo != null && !okrWorkBaseInfoList.contains(okrWorkBaseInfo)) { - okrWorkBaseInfoList.add(okrWorkBaseInfo); - } - } - } - } catch (Exception e) { - throw e; - } - return okrWorkBaseInfoList; - } - - /** - * 查询符合条件的数据总数 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getWorkCountWithFilter(WorkCommonSearchFilter wrapIn) throws Exception { - Business business = null; - if (wrapIn == null) { - throw new Exception("wrapIn is null!"); - } - wrapIn.setInfoType("WORK"); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getCountWithFilter(wrapIn); - } catch (Exception e) { - throw e; - } - } - - /** - * 查询需要立即进行汇报的工作ID - * - * @return - * @throws Exception - */ - public List listNeedReportWorkIds() throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listNeedReportWorkIds(); - } catch (Exception e) { - throw e; - } - } - - public List listByParentId(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("centerId is null."); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listByParentId(id); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据分析时间来查询需要进行进展分析的工作ID列表 - * - * @param report_progress - * @param count - * @return - * @throws Exception - */ - public List listIdsForNeedProgressAnalyse(String report_progress, int count) throws Exception { - if (report_progress == null || report_progress.isEmpty()) { - throw new Exception("report_progress is null."); - } - if (count == 0) { - throw new Exception("count is 0."); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listIdsForNeedProgressAnalyse(report_progress, count); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据指定的工作ID，进度汇报设置和进度分析时间来进行工作分析，并且更新进度、完成情况以及分析时间信息 - * - * @param id - * @param okrWorkReportBaseInfo - * @param report_progress - * @param analyse_time_flag - * @throws Exception - */ - public void analyseWorkProgress(String id, OkrWorkReportBaseInfo okrWorkReportBaseInfo, String report_progress, String nowDateTime) throws Exception { - if ("OPEN".equals(report_progress.toUpperCase())) { - // 汇报时需要进行工作进度和是否已完成的汇报。 - analyseWorkProgressFromReports(id, okrWorkReportBaseInfo, nowDateTime); - } else { - // 根据工作的部署时间，完成时限和当前时间来进行工作完成度的计算 - analyseWorkProgressFromProcessTimeLimit(id, nowDateTime); - } - } - - /** - * 汇报时需要进行工作进度和是否已完成的汇报。 - * - * @param workId - * @param okrWorkReportBaseInfo - * @param analyse_time_flag - * @throws Exception - */ - private void analyseWorkProgressFromReports(String workId, OkrWorkReportBaseInfo okrWorkReportBaseInfo, String analyse_time_flag) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null."); - } - if (analyse_time_flag == null || analyse_time_flag.isEmpty()) { - throw new Exception("analyse_time_flag is null."); - } - // 取到该工作最后一次，并且已经提交的汇报的内容 - // 根据汇报内容来确定该工作的进度情况。 - Business business = null; - Date nextReportTime = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkPerson okrWorkPerson = null; - List ids = null; - List statuses = new ArrayList(); - statuses.add("正常"); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkPerson.class); - emc.beginTransaction(OkrWorkReportBaseInfo.class); - - // 查询工作对象 - okrWorkBaseInfo = emc.find(workId, OkrWorkBaseInfo.class); - - if (okrWorkReportBaseInfo == null && okrWorkBaseInfo != null) { - okrWorkReportBaseInfo = business.okrWorkReportBaseInfoFactory().getLastCompletedReport(workId); - } - if (okrWorkReportBaseInfo != null) { - okrWorkBaseInfo.setIsCompleted(okrWorkReportBaseInfo.getIsWorkCompleted()); - if (okrWorkReportBaseInfo.getProgressPercent()>=100 || okrWorkReportBaseInfo.getIsWorkCompleted()) { - // 已经完成 - okrWorkBaseInfo.setCompleteTime(new Date()); - okrWorkBaseInfo.setIsCompleted(true); - okrWorkBaseInfo.setOverallProgress(100); - - // 修改所有干系人信息状态，从执行中修改为已完成，已删除的不要修改 - ids = business.okrWorkPersonFactory().listByWorkId(workId, statuses); - if (ids != null && !ids.isEmpty()) { - for (String id : ids) { - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - okrWorkPerson.setWorkProcessStatus("已完成"); - okrWorkPerson.setIsCompleted(true); - emc.check(okrWorkPerson, CheckPersistType.all); - } - } - - // 不需要进行汇报了，把工作的下次汇报时间设置为空 - okrWorkBaseInfo.setNextReportTime(null); - } else { - okrWorkBaseInfo.setIsCompleted(false); - okrWorkBaseInfo.setOverallProgress(okrWorkReportBaseInfo.getProgressPercent()); - - // 判断是否已经超时 - if (okrWorkBaseInfo.getCompleteDateLimit().before(new Date())) { - okrWorkBaseInfo.setIsOverTime(true); - - // 修改所有干系人信息状态，从执行中修改为已超时，已删除的不要修改 - ids = business.okrWorkPersonFactory().listByWorkId(workId, statuses); - if (ids != null && !ids.isEmpty()) { - for (String id : ids) { - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - okrWorkPerson.setWorkProcessStatus("执行中"); - okrWorkPerson.setIsCompleted(false); - okrWorkPerson.setIsOverTime(true); - emc.check(okrWorkPerson, CheckPersistType.all); - } - } - // TODO:如果下一次汇报时间为空，还得分析一下下一次的汇报时间 - if (okrWorkBaseInfo.getNextReportTime() == null) { - nextReportTime = getNextReportTime(okrWorkBaseInfo); - okrWorkBaseInfo.setNextReportTime(nextReportTime); - } - } - } - } else { - // 还没有开始汇报 - okrWorkBaseInfo.setIsCompleted(false); - okrWorkBaseInfo.setOverallProgress(0); - - // 判断是否已经超时 - if (okrWorkBaseInfo.getCompleteDateLimit().before(new Date())) { - okrWorkBaseInfo.setIsOverTime(true); - // 修改所有干系人信息状态，从执行中修改为已超时，已删除的不要修改 - ids = business.okrWorkPersonFactory().listByWorkId(workId, statuses); - if (ids != null && !ids.isEmpty()) { - for (String id : ids) { - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - okrWorkPerson.setWorkProcessStatus("执行中"); - okrWorkPerson.setIsCompleted(false); - okrWorkPerson.setIsOverTime(true); - emc.check(okrWorkPerson, CheckPersistType.all); - } - } - } - - // TODO:如果下一次汇报时间为空，还得分析一下下一次的汇报时间 - if (okrWorkBaseInfo.getNextReportTime() == null) { - nextReportTime = getNextReportTime(okrWorkBaseInfo); - okrWorkBaseInfo.setNextReportTime(nextReportTime); - } - } - - if (okrWorkBaseInfo != null) { - okrWorkBaseInfo.setProgressAnalyseTime(analyse_time_flag); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - } - emc.commit(); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据工作信息分析工作的下次汇报时间是否正常 - * - * @param okrWorkBaseInfo - * @return - * @throws Exception - */ - public Date getNextReportTime(OkrWorkBaseInfo okrWorkBaseInfo) throws Exception { - if (!okrWorkBaseInfo.getIsCompleted()) { - String reportStartTime = "10:00:00"; - Calendar calendar = Calendar.getInstance(); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - reportStartTime = business.okrConfigSystemFactory().getValueWithConfigCode("REPORT_CREATETIME"); - } catch (Exception e) { - reportStartTime = "10:00:00"; - } - if (reportStartTime == null || reportStartTime.isEmpty()) { - reportStartTime = "10:00:00"; - } - // 如果下次汇报的时间不为空，并且下一次汇报时间有效，那么直接返回 - if (okrWorkBaseInfo.getNextReportTime() != null) { - calendar.setTime(dateOperation.getDateFromString( - dateOperation.getDateStringFromDate(okrWorkBaseInfo.getNextReportTime(), "yyyy-MM-dd") + " " - + reportStartTime)); - okrWorkBaseInfo.setNextReportTime(calendar.getTime()); - if (okrWorkBaseInfo.getLastReportTime() == null) { - if (okrWorkBaseInfo.getNextReportTime().after(new Date())) { - return okrWorkBaseInfo.getNextReportTime(); - } - } else { - if (okrWorkBaseInfo.getNextReportTime().after(okrWorkBaseInfo.getLastReportTime())) { - return okrWorkBaseInfo.getNextReportTime(); - } - } - } - if (okrWorkBaseInfo.getLastReportTime() == null) { - // 如果上次汇报时间为空，也就是说没有进行过任何汇报 - // 根据工作的汇报周期配置来计算离今天最近的后一次汇报时间 - return calculateNextCycleTime(reportStartTime, okrWorkBaseInfo.getReportCycle(), - okrWorkBaseInfo.getReportDayInCycle(), new Date()); - } else { - // 根据上一次汇报时间来计算下一次汇报时间 - return calculateNextCycleTime(reportStartTime, okrWorkBaseInfo.getReportCycle(), - okrWorkBaseInfo.getReportDayInCycle(), okrWorkBaseInfo.getLastReportTime()); - } - } - return null; - } - - /** - * TODO:根据周期方式，以后周期时间点，和开始时间来计算下一个周期时间点 - * - * @param reportCycle - * @param reportDayInCycle - * @param date - * @return - * @throws Exception - */ - private Date calculateNextCycleTime(String reportStartTime, String reportCycle, Integer reportDayInCycle, - Date lastReportDate) throws Exception { - int reportDay = 0; - int dayMaxNumber = 0; - Calendar calendar = Calendar.getInstance(); - calendar.setTime(dateOperation.getDateFromString( - dateOperation.getDateStringFromDate(lastReportDate, "yyyy-MM-dd") + " " + reportStartTime)); - if (reportCycle != null && reportCycle.trim().equals("每月汇报")) { - dayMaxNumber = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); - if (dayMaxNumber < reportDayInCycle) { - reportDay = dayMaxNumber; - } else { - reportDay = reportDayInCycle; - } - calendar.set(Calendar.DAY_OF_MONTH, reportDay); - // 如果本月汇报时间已经过了，那么下月再汇报 - System.out.println(calendar.getTime() + ".before(" + lastReportDate + "):" - + calendar.getTime().before(lastReportDate)); - while (calendar.getTime().before(lastReportDate)) { - calendar.set(Calendar.DAY_OF_MONTH, reportDay); - calendar.add(Calendar.MONTH, 1); - } - } else if (reportCycle != null && reportCycle.trim().equals("每周汇报")) { - dayMaxNumber = 7; - if (dayMaxNumber < reportDayInCycle) { - reportDay = dayMaxNumber; - } else { - reportDay = reportDayInCycle; - } - calendar.set(Calendar.DAY_OF_WEEK, reportDay); - // 如果本周汇报时间已经过了，那么下周再汇报 - System.out.println(calendar.getTime() + ".before(" + lastReportDate + "):" - + calendar.getTime().before(lastReportDate)); - while (calendar.getTime().before(lastReportDate)) { - calendar.set(Calendar.DAY_OF_WEEK, reportDay); - calendar.add(Calendar.WEEK_OF_YEAR, 1); - } - } - // 判断是否周末 - while (dateOperation.isWeekend(calendar.getTime())) { - calendar.add(Calendar.DATE, 1); - } - return dateOperation.getDateFromString( - dateOperation.getDateStringFromDate(calendar.getTime(), "yyyy-MM-dd") + " " + reportStartTime); - } - - /** - * 根据工作的部署时间，完成时限和当前时间来进行工作完成度的计算 - * - * @param workId - * @param analyse_time_flag - * @throws Exception - */ - private void analyseWorkProgressFromProcessTimeLimit(String workId, String analyse_time_flag) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null."); - } - if (analyse_time_flag == null || analyse_time_flag.isEmpty()) { - throw new Exception("analyse_time_flag is null."); - } - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkPerson okrWorkPerson = null; - Business business = null; - Integer completePercent = 0; - String deployDateString = null; - Date startDateTime = null, processDateLimit = null, nowDate = new Date(); - List ids = null; - List statuses = new ArrayList(); - statuses.add("正常"); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - // 查询工作对象 - okrWorkBaseInfo = emc.find(workId, OkrWorkBaseInfo.class); - if (okrWorkBaseInfo != null) { - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkPerson.class); - - processDateLimit = okrWorkBaseInfo.getCompleteDateLimit(); - if (processDateLimit == null) { - throw new Exception( - "work process date limit is null, system can not analyse work progress from process time limit."); - } - - deployDateString = okrWorkBaseInfo.getDeployDateStr(); - if (deployDateString == null || deployDateString.isEmpty()) { - throw new Exception( - "work deploy date string is null, system can not analyse work progress from process time limit."); - } - - try { - startDateTime = dateOperation.getDateFromString(deployDateString); - } catch (Exception e) { - logger.warn("work deploy date string is not date style[deployDateString=" + deployDateString - + "], system can not analyse work progress from process time limit."); - throw e; - } - - // 根据部署时间，当前时间和结束时间进行进度计算 - if (processDateLimit.before(nowDate)) { - // 处理时间已经耗尽，工作已经完成 - okrWorkBaseInfo.setCompleteTime(new Date()); - okrWorkBaseInfo.setIsCompleted(true); - okrWorkBaseInfo.setOverallProgress(100); - okrWorkBaseInfo.setNextReportTime(null); - // 修改所有干系人信息状态，从执行中修改为已完成，已删除的不要修改 - ids = business.okrWorkPersonFactory().listByWorkId(workId, statuses); - if (ids != null && !ids.isEmpty()) { - for (String id : ids) { - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - okrWorkPerson.setWorkProcessStatus("已完成"); - okrWorkPerson.setIsCompleted(true); - emc.check(okrWorkPerson, CheckPersistType.all); - } - } - } else { - // 计算完成百分比 - long usedTime = nowDate.getTime() - startDateTime.getTime(); - long fullTime = processDateLimit.getTime() - startDateTime.getTime(); - if (fullTime > usedTime) { - completePercent = Integer.parseInt(((usedTime * 100) / fullTime) + ""); - } else { - completePercent = 0; - } - okrWorkBaseInfo.setIsCompleted(false); - okrWorkBaseInfo.setOverallProgress(completePercent); - } - - if (okrWorkBaseInfo != null) { - okrWorkBaseInfo.setProgressAnalyseTime(analyse_time_flag); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - } - } - emc.commit(); - } catch (Exception e) { - throw e; - } - } - - public Long getWorkTotalByCenterId(String centerId, List status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getWorkTotalByCenterId(centerId, status); - } catch (Exception e) { - throw e; - } - } - - public Long getProcessingWorkCountByCenterId(String centerId, List status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getProcessingWorkCountByCenterId(centerId, status); - } catch (Exception e) { - throw e; - } - } - - public Long getCompletedWorkCountByCenterId(String centerId, List status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getCompletedWorkCountByCenterId(centerId, status); - } catch (Exception e) { - throw e; - } - } - - public Long getOvertimeWorkCountByCenterId(String centerId, List status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getOvertimeWorkCountByCenterId(centerId, status); - } catch (Exception e) { - throw e; - } - } - - public Long getDraftWorkCountByCenterId(String centerId, List status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getDraftWorkCountByCenterId(centerId, status); - } catch (Exception e) { - throw e; - } - } - - /** - * 判断用户是否存在未提交的汇报数据 - * - * @param workId - * @param activityName - * @param processStatus - * @param processIdentity - * @return - * @throws Exception - */ - public Boolean hasNoneSubmitReport(String workId, String activityName, String processStatus, String processIdentity) - throws Exception { - Business business = null; - List ids = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - ids = business.okrWorkReportBaseInfoFactory().listByWorkId(workId, activityName, processStatus, - processIdentity); - if (ids != null && !ids.isEmpty()) { - return true; - } else { - return false; - } - } catch (Exception e) { - throw e; - } - } - - /** - * 查询所有未完成工作列表 - * - * @return - * @throws Exception - */ - public List listAllProcessingWorks() throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listAllProcessingWorks(); - } catch (Exception e) { - throw e; - } - } - - /** - * 查询所有未完成工作列表 - * - * @return - * @throws Exception - */ - public List listAllProcessingWorkIds() throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listAllProcessingWorkIds(); - } catch (Exception e) { - throw e; - } - } - - public List listAllDeployedWorks(String centerId, String status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listAllDeployedWorks(centerId, status); - } catch (Exception e) { - throw e; - } - } - - public List listAllDeployedWorkIds(String centerId, String status) throws Exception { - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().listAllDeployedWorkIds(centerId, status); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据工作ID，获取指定工作的所有下级工作ID列表 - * - * @param id - * @return - * @throws Exception - */ - public List getSubNormalWorkBaseInfoIds(String workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, return null!"); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkBaseInfoFactory().getSubNormalWorkBaseInfoIds(workId); - } catch (Exception e) { - throw e; - } - } - - public Boolean hasSubWork(String workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, return null!"); - } - List ids = null; - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - ids = business.okrWorkBaseInfoFactory().getSubNormalWorkBaseInfoIds(workId); - if (ids != null && !ids.isEmpty()) { - return true; - } else { - return false; - } - } catch (Exception e) { - throw e; - } - } - - /** - * 为工作绑定考核流程ID - * @param workId - * @param wf_workId - * @return - * @throws Exception - */ - public Boolean bindAppraiseWfId(String workId, String wf_workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, return null!"); - } - if (wf_workId == null || wf_workId.isEmpty()) { - throw new Exception("wf_workId is null, return null!"); - } - OkrWorkBaseInfo okrWorkBaseInfo = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkBaseInfo = emc.find( workId, OkrWorkBaseInfo.class ); - if( okrWorkBaseInfo != null ) { - emc.beginTransaction( OkrWorkBaseInfo.class ); - okrWorkBaseInfo.setCurrentAppraiseWorkId(wf_workId); - okrWorkBaseInfo.setCurrentAppraiseInfoId(""); - okrWorkBaseInfo.setCurrentActivityName("拟稿"); - okrWorkBaseInfo.setCurrentAppraiseStatus("审核中"); - if(okrWorkBaseInfo.getAppraiseTimes() == null) { - okrWorkBaseInfo.setAppraiseTimes(1); - }else { - okrWorkBaseInfo.setAppraiseTimes( okrWorkBaseInfo.getAppraiseTimes() + 1 ); - } - emc.commit(); - return true; - } - } catch (Exception e) { - throw e; - } - return false; - } - - public OkrAttachmentFileInfo saveAttachment(String workId, OkrAttachmentFileInfo attachment) throws Exception { - if( workId == null ){ - throw new Exception( "workId is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - OkrWorkBaseInfo work = emc.find( workId, OkrWorkBaseInfo.class ); - if( work != null ){ - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrWorkBaseInfo.class ); - emc.persist(attachment, CheckPersistType.all ); - if( work.getAttachmentList()== null ) { - work.setAttachmentList( new ArrayList<>()); - } - if( !work.getAttachmentList().contains( attachment.getId() )) { - work.getAttachmentList().add( attachment.getId() ); - emc.check( work, CheckPersistType.all ); - } - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - return attachment; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoWfSycnService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoWfSycnService.java deleted file mode 100644 index b932373a30..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkBaseInfoWfSycnService.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.dataadapter.workflow.WorkComplexGetter; -import com.x.okr.assemble.control.dataadapter.workflow.WorkComplexGetter.Wo; -import com.x.okr.entity.OkrWorkAppraiseInfo; -import com.x.okr.entity.OkrWorkBaseInfo; - -/** - * 工作考核流程信息同步 - * - * @author O2LEE - * - */ -public class OkrWorkBaseInfoWfSycnService { - -// private static Logger logger = LoggerFactory.getLogger( OkrWorkBaseInfoWfSycnService.class ); - private WorkComplexGetter workComplexGetter = new WorkComplexGetter(); - - public void sync(String workInfoId, String wf_workId) throws Exception { - //先获取wf_workId这个流程的信息，看看流程信息是否存在 - Wo woWorkComplex = workComplexGetter.getWorkComplex(wf_workId); - OkrWorkAppraiseInfo okrWorkAppraiseInfo = null; - OkrWorkBaseInfo okrWorkBaseInfo = null; - if( woWorkComplex != null && woWorkComplex.getActivity() != null && woWorkComplex.getWork() != null ) { - //流程信息存在，看看OKR里是否有流程的信息 - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrWorkAppraiseInfo.class); - - okrWorkBaseInfo = emc.find( workInfoId, OkrWorkBaseInfo.class ); - if( okrWorkBaseInfo != null ) { - List wf_info_list = business.okrWorkAppraiseInfoFactory().listIdsWithWorkId(workInfoId, wf_workId); - if( ListTools.isNotEmpty(wf_info_list) ) { - //存在流程信息 - okrWorkAppraiseInfo = emc.find( wf_info_list.get(0), OkrWorkAppraiseInfo.class ); - okrWorkAppraiseInfo.setActivityName(woWorkComplex.getActivity().getName()); - okrWorkAppraiseInfo.setTitle(woWorkComplex.getWork().getTitle()); - - if( "拟稿".equals(woWorkComplex.getActivity().getName())) { - okrWorkAppraiseInfo.setStatus("拟稿"); - okrWorkBaseInfo.setCurrentAppraiseStatus("拟稿"); - }else if( "结束".equals(woWorkComplex.getActivity().getName())){ - okrWorkAppraiseInfo.setStatus("结束"); - okrWorkBaseInfo.setCurrentAppraiseStatus("结束"); - }else { - okrWorkAppraiseInfo.setStatus("审核中"); - okrWorkBaseInfo.setCurrentAppraiseStatus("审核中"); - } - emc.check(okrWorkAppraiseInfo, CheckPersistType.all); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - }else { - //需要新建一个流程信息 - okrWorkAppraiseInfo = new OkrWorkAppraiseInfo(); - okrWorkAppraiseInfo.setId( workInfoId ); - okrWorkAppraiseInfo.setCenterId(okrWorkBaseInfo.getCenterId()); - okrWorkAppraiseInfo.setCenterTitle(okrWorkBaseInfo.getCenterTitle()); - okrWorkAppraiseInfo.setId(wf_workId); - okrWorkAppraiseInfo.setWf_jobId(woWorkComplex.getWork().getJob()); - okrWorkAppraiseInfo.setWf_workId(wf_workId); - okrWorkAppraiseInfo.setWorkId(workInfoId); - okrWorkAppraiseInfo.setWorkTitle(okrWorkBaseInfo.getTitle()); - okrWorkAppraiseInfo.setActivityName(woWorkComplex.getActivity().getName()); - okrWorkAppraiseInfo.setTitle(woWorkComplex.getWork().getTitle()); - - okrWorkBaseInfo.setCurrentAppraiseInfoId(okrWorkAppraiseInfo.getId()); - okrWorkBaseInfo.setCurrentAppraiseWorkId(workInfoId); - - if( okrWorkBaseInfo.getAppraiseInfoList() == null ) { - okrWorkBaseInfo.setAppraiseInfoList( new ArrayList<>()); - } - if( okrWorkBaseInfo.getAppraiseInfoList().contains( workInfoId )) { - okrWorkBaseInfo.getAppraiseInfoList().add( workInfoId ); - } - - if( "拟稿".equals(woWorkComplex.getActivity().getName())) { - okrWorkAppraiseInfo.setStatus("拟稿"); - okrWorkBaseInfo.setCurrentAppraiseStatus("拟稿"); - }else if( "结束".equals(woWorkComplex.getActivity().getName())){ - okrWorkAppraiseInfo.setStatus("结束"); - okrWorkBaseInfo.setCurrentAppraiseStatus("结束"); - }else { - okrWorkAppraiseInfo.setStatus("审核中"); - okrWorkBaseInfo.setCurrentAppraiseStatus("审核中"); - } - emc.persist(okrWorkAppraiseInfo, CheckPersistType.all); - emc.check(okrWorkBaseInfo, CheckPersistType.all); - } - } - }catch( Exception e ){ - throw e; - } - }else { - throw new Exception("流程不存在！WORKID:" + wf_workId ); - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkChatService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkChatService.java deleted file mode 100644 index 42239e5619..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkChatService.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrWorkChat; - -/** - * 类 名：OkrWorkChatService
- * 实体类：OkrWorkChat
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 - **/ -public class OkrWorkChatService { - - private static Logger logger = LoggerFactory.getLogger(OkrWorkChatService.class); - - /** - * 根据传入的ID从数据库查询OkrWorkChat对象 - * - * @param id - * @return - * @throws Exception - */ - public OkrWorkChat get(String id) throws Exception { - if (id == null || id.isEmpty()) { - throw new Exception("id is null, return null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find(id, OkrWorkChat.class); - } catch (Exception e) { - throw e; - } - } - - /** - * 根据传入的ID从数据库查询OkrWorkChat对象 - * - * @param id - * @return - * @throws Exception - */ - public List listByWorkId(String workId) throws Exception { - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null, return null!"); - } - Business business = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkChatFactory().listByWorkId(workId); - } catch (Exception e) { - throw e; - } - } - - /** - * 向数据库保存OkrWorkChat对象 - * - * @param wrapIn - */ - public OkrWorkChat save(OkrWorkChat wrapIn) throws Exception { - OkrWorkChat okrWorkChat = null; - if (wrapIn.getId() != null && wrapIn.getId().trim().length() > 20) { - // 根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkChat = new OkrWorkChat(); - emc.beginTransaction(OkrWorkChat.class); - wrapIn.copyTo(okrWorkChat); - okrWorkChat.setId(wrapIn.getId());// 使用参数传入的ID作为记录的ID - emc.persist(okrWorkChat, CheckPersistType.all); - emc.commit(); - } catch (Exception e) { - logger.warn("OkrWorkChat update/ got a error!"); - throw e; - } - } else {// 没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkChat = new OkrWorkChat(); - emc.beginTransaction(OkrWorkChat.class); - wrapIn.copyTo(okrWorkChat); - emc.persist(okrWorkChat, CheckPersistType.all); - emc.commit(); - } catch (Exception e) { - logger.warn("OkrWorkChat create got a error!"); - logger.error(e); - throw e; - } - } - return okrWorkChat; - } - - /** - * 根据ID从数据库中删除OkrWorkChat对象 - * - * @param id - * @throws Exception - */ - public void delete(String id) throws Exception { - OkrWorkChat okrWorkChat = null; - if (id == null || id.isEmpty()) { - throw new Exception("id is null, system can not delete any object."); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - // 先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkChat = emc.find(id, OkrWorkChat.class); - if (null == okrWorkChat) { - throw new Exception("object is not exist {'id':'" + id + "'}"); - } else { - emc.beginTransaction(OkrWorkChat.class); - emc.remove(okrWorkChat, CheckRemoveType.all); - emc.commit(); - } - } catch (Exception e) { - throw e; - } - } - - /** - * 查询下一页的信息数据，直接调用Factory里的方法 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listChatNextWithFilter(String id, Integer count, String workId, String sequenceField, - String order) throws Exception { - - Business business = null; - Object sequence = null; - if (workId == null) { - throw new Exception("workId is null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if (id != null && !"(0)".equals(id) && id.trim().length() > 20) { - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty(emc.find(id, OkrWorkChat.class), JpaObject.sequence_FIELDNAME); - } - } - return business.okrWorkChatFactory().listNextWithFilter(id, count, sequence, workId, sequenceField, order); - - } catch (Exception e) { - throw e; - } - } - - /** - * 查询上一页的信息数据，直接调用Factory里的方法 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listChatPrevWithFilter(String id, Integer count, String workId, String sequenceField, - String order) throws Exception { - Business business = null; - Object sequence = null; - if (workId == null) { - throw new Exception("workId is null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if (id != null && !"(0)".equals(id) && id.trim().length() > 20) { - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty(emc.find(id, OkrWorkChat.class), JpaObject.sequence_FIELDNAME); - } - } - return business.okrWorkChatFactory().listPrevWithFilter(id, count, sequence, workId, sequenceField, order); - - } catch (Exception e) { - throw e; - } - } - - /** - * 查询符合条件的数据总数 - * - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getChatCountWithFilter(String workId) throws Exception { - Business business = null; - if (workId == null || workId.isEmpty()) { - throw new Exception("workId is null!"); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkChatFactory().getCountWithFilter(workId); - } catch (Exception e) { - throw e; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDetailInfoService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDetailInfoService.java deleted file mode 100644 index 4c1ed1e030..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDetailInfoService.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.x.okr.assemble.control.service; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.entity.OkrWorkDetailInfo; - -/** - * 类 名：OkrWorkDetailInfoService
- * 实体类：OkrWorkDetailInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkDetailInfoService{ - - private static Logger logger = LoggerFactory.getLogger( OkrWorkDetailInfoService.class ); - - /** - * 根据传入的ID从数据库查询OkrWorkDetailInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkDetailInfo get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrWorkDetailInfo.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrWorkDetailInfo对象 - * @param wrapIn - */ - public OkrWorkDetailInfo save( OkrWorkDetailInfo wrapIn ) throws Exception { - OkrWorkDetailInfo okrWorkDetailInfo = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkDetailInfo = emc.find( wrapIn.getId(), OkrWorkDetailInfo.class ); - if( okrWorkDetailInfo != null ){ - emc.beginTransaction( OkrWorkDetailInfo.class ); - wrapIn.copyTo( okrWorkDetailInfo , JpaObject.FieldsUnmodify); - emc.check( okrWorkDetailInfo, CheckPersistType.all ); - emc.commit(); - }else{ - okrWorkDetailInfo = new OkrWorkDetailInfo(); - emc.beginTransaction( OkrWorkDetailInfo.class ); - wrapIn.copyTo( okrWorkDetailInfo ); - okrWorkDetailInfo.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrWorkDetailInfo, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrWorkDetailInfo update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkDetailInfo = new OkrWorkDetailInfo(); - emc.beginTransaction( OkrWorkDetailInfo.class ); - wrapIn.copyTo( okrWorkDetailInfo ); - emc.persist( okrWorkDetailInfo, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkDetailInfo create got a error!", e); - throw e; - } - } - return okrWorkDetailInfo; - } - - /** - * 根据ID从数据库中删除OkrWorkDetailInfo对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrWorkDetailInfo okrWorkDetailInfo = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkDetailInfo = emc.find(id, OkrWorkDetailInfo.class); - if (null == okrWorkDetailInfo) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrWorkDetailInfo.class ); - emc.remove( okrWorkDetailInfo, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public String getWorkDetailWithId( String workId ) throws Exception { - OkrWorkDetailInfo okrWorkDetailInfo = null; - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkDetailInfo = emc.find( workId, OkrWorkDetailInfo.class); - if ( null == okrWorkDetailInfo ) { - logger.warn( "object is not exist {'id':'"+ workId +"'}" ); - return "无"; - }else{ - return okrWorkDetailInfo.getWorkDetail(); - } - } catch ( Exception e ) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDynamicsService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDynamicsService.java deleted file mode 100644 index e323c0788f..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkDynamicsService.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.Date; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrWorkDynamics; - -/** - * 类 名：OkrWorkDynamicsService
- * 实体类：OkrWorkDynamics
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkDynamicsService{ - private static Logger logger = LoggerFactory.getLogger( OkrWorkDynamicsService.class ); - private DateOperation dateOperation = new DateOperation(); - - /** - * 根据传入的ID从数据库查询OkrWorkDynamics对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkDynamics get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrWorkDynamics.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrWorkDynamics对象 - * @param wrapIn - */ - public OkrWorkDynamics save( OkrWorkDynamics wrapIn ) throws Exception { - OkrWorkDynamics okrWorkDynamics = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkDynamics = emc.find( wrapIn.getId(), OkrWorkDynamics.class ); - if( okrWorkDynamics != null ){ - emc.beginTransaction( OkrWorkDynamics.class ); - wrapIn.copyTo( okrWorkDynamics, JpaObject.FieldsUnmodify ); - emc.check( okrWorkDynamics, CheckPersistType.all ); - emc.commit(); - }else{ - okrWorkDynamics = new OkrWorkDynamics(); - emc.beginTransaction( OkrWorkDynamics.class ); - wrapIn.copyTo( okrWorkDynamics ); - okrWorkDynamics.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrWorkDynamics, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrWorkDynamics update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkDynamics = new OkrWorkDynamics(); - emc.beginTransaction( OkrWorkDynamics.class ); - wrapIn.copyTo( okrWorkDynamics ); - emc.persist( okrWorkDynamics, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkDynamics create got a error!", e); - throw e; - } - } - return okrWorkDynamics; - } - - /** - * 根据ID从数据库中删除OkrWorkDynamics对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrWorkDynamics okrWorkDynamics = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkDynamics = emc.find(id, OkrWorkDynamics.class); - if ( null == okrWorkDynamics ) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrWorkDynamics.class ); - emc.remove( okrWorkDynamics, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public void processReadDynamic1( OkrTask okrTask, String dynamicType, String operatorName, String targetName, String targetIdentity, String content, String description ) throws Exception { - if( okrTask == null ){ - throw new Exception( "okrTask is null, system can not delete any object." ); - } - if( operatorName == null || operatorName.isEmpty() ){ - throw new Exception( "operatorName is null, system can not delete any object." ); - } - if( content == null || content.isEmpty() ){ - throw new Exception( "content is null, system can not delete any object." ); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - OkrWorkDynamics okrWorkDynamics = new OkrWorkDynamics(); - okrWorkDynamics.setCenterId( okrTask.getCenterId() ); - okrWorkDynamics.setCenterTitle( okrTask.getCenterTitle() ); - okrWorkDynamics.setWorkId( okrTask.getWorkId() ); - okrWorkDynamics.setWorkTitle( okrTask.getTitle() ); - okrWorkDynamics.setDynamicObjectId( okrTask.getId() ); - okrWorkDynamics.setDynamicObjectTitle( okrTask.getTitle() ); - okrWorkDynamics.setDynamicObjectType( "工作汇报待阅" ); - okrWorkDynamics.setContent( content ); - okrWorkDynamics.setDynamicType( dynamicType ); - okrWorkDynamics.setDateTime( new Date() ); - okrWorkDynamics.setDateTimeStr( dateOperation.getNowDateTime() ); - okrWorkDynamics.setDescription( description ); - okrWorkDynamics.setOperatorName(operatorName ); - okrWorkDynamics.setTargetIdentity( targetIdentity ); - okrWorkDynamics.setTargetName( targetName ); - - emc.beginTransaction( OkrWorkDynamics.class ); - emc.persist( okrWorkDynamics, CheckPersistType.all ); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkDynamics update/ got a error!" ); - throw e; - } - } - - /** - * 查询下一页的信息数据，直接调用Factory里的方法 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listDynamicNextWithFilter( String id, Integer count, - List centerIds, List workIds, String sequenceField, - String order, Boolean isOkrSystemAdmin ) throws Exception { - Business business = null; - Object sequence = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase( id,StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkDynamics.class ), JpaObject.sequence_FIELDNAME ); - } - } - return business.okrWorkDynamicsFactory().listNextWithFilter( id, count, sequence, centerIds, workIds, - sequenceField, order, isOkrSystemAdmin ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 查询上一页的信息数据，直接调用Factory里的方法 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public List listDynamicPrevWithFilter( String id, Integer count, List centerIds, List workIds, String sequenceField, - String order, Boolean isOkrSystemAdmin ) throws Exception { - Business business = null; - Object sequence = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase( id,StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkDynamics.class ), JpaObject.sequence_FIELDNAME ); - } - } - return business.okrWorkDynamicsFactory().listPrevWithFilter( id, count, sequence, centerIds, workIds, - sequenceField, order, isOkrSystemAdmin ); - - } catch ( Exception e ) { - throw e; - } - } - - /** - * 查询符合条件的数据总数 - * @param id - * @param count - * @param sequence - * @param wrapIn - * @return - * @throws Exception - */ - public Long getDynamicCountWithFilter( List centerIds, List workIds, String sequenceField, - String order, Boolean isOkrSystemAdmin ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkDynamicsFactory().getCountWithFilter( centerIds, workIds, - sequenceField, order, isOkrSystemAdmin ); - } catch ( Exception e ) { - throw e; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonSearchService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonSearchService.java deleted file mode 100644 index ed329148c3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonSearchService.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrWorkPersonSearchService { - - public List listCenterInfoNextWithFilter( String id, Integer count, com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter wrapIn ) throws Exception { - List centerWorkInfos = new ArrayList(); - List okrWorkPersonList = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - Business business = null; - Object sequence = null; - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if ( !StringUtils.equalsIgnoreCase( id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrCenterWorkInfo.class ), JpaObject.sequence_FIELDNAME ); - } - } - okrWorkPersonList = business.okrWorkPersonSearchFactory().listCenterWorkPersonNextWithFilter( id, count, sequence, wrapIn ); - if( okrWorkPersonList != null && !okrWorkPersonList.isEmpty() ){ - for( OkrWorkPerson person : okrWorkPersonList ){ - okrCenterWorkInfo = emc.find( person.getCenterId(), OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null ){ - //查询中心工作下级工作总数 - //查询中心工作下所有工作总数 - centerWorkInfos.add( okrCenterWorkInfo ); - } - } - } - } catch ( Exception e ) { - throw e; - } - return centerWorkInfos; - } - - public List listCenterInfoPrevWithFilter( String id, Integer count, com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter wrapIn ) throws Exception { - List centerWorkInfos = new ArrayList(); - List okrWorkPersonList = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - Business business = null; - Object sequence = null; - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if ( !StringUtils.equalsIgnoreCase( id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrCenterWorkInfo.class ), JpaObject.sequence_FIELDNAME ); - } - } - okrWorkPersonList = business.okrWorkPersonSearchFactory().listCenterWorkPersonPrevWithFilter( id, count, sequence, wrapIn ); - if( okrWorkPersonList != null && !okrWorkPersonList.isEmpty() ){ - for( OkrWorkPerson person : okrWorkPersonList ){ - okrCenterWorkInfo = emc.find( person.getCenterId(), OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null ){ - //查询中心工作下级工作总数 - //查询中心工作下所有工作总数 - centerWorkInfos.add( okrCenterWorkInfo ); - } - } - } - } catch ( Exception e ) { - throw e; - } - return centerWorkInfos; - } - - public Long getCenterCountWithFilter( com.x.okr.assemble.control.jaxrs.WorkCommonQueryFilter wrapIn ) throws Exception { - Business business = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonSearchFactory().getCountForCenterInfoWithFilter(wrapIn); - } catch ( Exception e ) { - throw e; - } - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonService.java deleted file mode 100644 index 8bde80a91c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkPersonService.java +++ /dev/null @@ -1,996 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.okrworkperson.WrapInOkrWorkPerson; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkPerson; - -public class OkrWorkPersonService { - - private static Logger logger = LoggerFactory.getLogger( OkrWorkPersonService.class ); - private WrapCopier wrapin_copier = WrapCopierFactory.wo( WrapInOkrWorkPerson.class, OkrWorkPerson.class, null, WrapInOkrWorkPerson.Excludes ); - private DateOperation dateOperation = new DateOperation(); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - /** - * 根据传入的ID从数据库查询OkrWorkPerson对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkPerson get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - return emc.find( id, OkrWorkPerson.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrWorkPerson对象 - * @param wrapIn - */ - public void saveCenterWorkPerson( WrapInOkrWorkPerson wrapIn ) throws Exception { - OkrWorkPerson entity = new OkrWorkPerson(); - entity = wrapin_copier.copy( wrapIn, entity ); - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - entity.setId( wrapIn.getId() ); - } - saveCenterWorkPerson( entity ); - } - - /** - * 向数据库保存OkrWorkPerson对象 - * 不仅是ID要唯一，并且员工姓名，中心工作ID和工作ID，还有身份也是一套唯一键 - * @param OkrWorkPerson - */ - public void saveCenterWorkPerson( OkrWorkPerson entity ) throws Exception { - Business business = null; - List ids = null; - List stauts = new ArrayList<>(); - stauts.add("正常"); - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //同一个员工在相同的工作里同一个身份只能有一条记录 - ids = business.okrWorkPersonFactory().listIdsForCenterWorkByCenterId( entity.getCenterId(), entity.getEmployeeIdentity(), entity.getProcessIdentity(), stauts ); - if( ids == null || ids.isEmpty() ){ - emc.beginTransaction( OkrWorkPerson.class ); - emc.persist( entity, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrWorkPerson update/ get a error!" ); - throw e; - } - } - - /** - * 根据ID从数据库中删除OkrWorkPerson对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrWorkPerson okrWorkPerson = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkPerson = emc.find(id, OkrWorkPerson.class); - if (null == okrWorkPerson) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrWorkPerson.class ); - emc.remove( okrWorkPerson, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据用户姓名，查询用户有权限访问的所有具体工作ID列表 - */ - public List listDistinctWorkIdsByIdentity( String userIdentity, String centerId, List statuses ) throws Exception { - Business business = null; - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception( "userIdentity is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctWorkIdsByIdentity( userIdentity, centerId, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据用户姓名，查询用户有权限访问的所有具体工作ID列表 - */ - public List listDistinctWorkIdsWithMe( String userIdentity, String centerId ) throws Exception { - Business business = null; - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception( "userIdentity is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctWorkIdsWithMe( userIdentity, centerId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据用户姓名和处理身份，查询用户有权限访问的所有具体工作ID列表 - * @param name - * @param processIdentity - * @return - * @throws Exception - */ - public List listDistinctWorkIdsByPerson(String name, String processIdentity ) throws Exception { - Business business = null; - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, system can not query any object." ); - } - if( processIdentity == null || processIdentity.isEmpty() ){ - throw new Exception( "processIdentity is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctWorkIdsByPerson( name, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据用户姓名查询用户有权限访问的所有中心工作ID列表 - * @param name - * @return - * @throws Exception - */ - public List listDistinctCenterIdsByPerson( String name, List statuses ) throws Exception { - Business business = null; - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctCenterIdsByPerson( name, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据用户身份查询用户有权限访问的所有中心工作ID列表 - * @param name - * @return - * @throws Exception - */ - public List listDistinctCenterIdsByPersonIdentity( String userIdentity, String processIdentity, List statuses ) throws Exception { - Business business = null; - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception( "userIdentity is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctCenterIdsByPersonIdentity( userIdentity, processIdentity, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据组织名称查询用户有权限访问的所有中心工作ID列表 - * @param name - * @return - * @throws Exception - */ - public List listDistinctCenterIdsByUnitName(String name, List statuses ) throws Exception { - Business business = null; - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctCenterIdsByUnitName( name, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据组织名称列表查询用户有权限访问的所有中心工作ID列表 - * @param name - * @return - * @throws Exception - */ - public List listDistinctCenterIdsByUnitNames( List names, List statuses) throws Exception { - Business business = null; - if( names == null || names.isEmpty() ){ - throw new Exception( "names is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctCenterIdsByUnitNames( names, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据顶层组织名称查询用户有权限访问的所有中心工作ID列表 - * @param name - * @return - * @throws Exception - */ - public List listDistinctCenterIdsByTopUnitName(String name, List statuses) throws Exception { - Business business = null; - if( name == null || name.isEmpty() ){ - throw new Exception( "name is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctCenterIdsByTopUnitName( name, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据顶层组织名称列表查询用户有权限访问的所有中心工作ID列表 - * @param name - * @return - * @throws Exception - */ - public List listDistinctCenterIdsByTopUnitNames( List names, List statuses) throws Exception { - Business business = null; - if( names == null || names.isEmpty() ){ - throw new Exception( "names is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctCenterIdsByTopUnitNames( names, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID，获取工作的指定干系人 - * @param id - * @param identity - * @return - * @throws Exception - */ - public List getWorkPerson(String workId, String identity, List statuses) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "id is null, system can not query responsibility for work." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getWorkPerson( workId, identity, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据中心工作信息来维护中心工作干系人 - * 为中心工作添加创建者，部署者，并且把两人都加入到中心工作观察者里 - * @param okrCenterWorkInfo - * @throws Exception - */ - public void saveCenterWorkPersonByCenterWork( OkrCenterWorkInfo okrCenterWorkInfo) throws Exception { - OkrWorkPerson okrWorkPerson = null; - if( okrCenterWorkInfo.getCreatorName() != null && !okrCenterWorkInfo.getCreatorName().isEmpty() ){ - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getCreatorName(), okrCenterWorkInfo.getCreatorIdentity(), okrCenterWorkInfo.getCreatorUnitName(), okrCenterWorkInfo.getCreatorTopUnitName(), "创建者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setWorkProcessStatus( okrCenterWorkInfo.getProcessStatus() ); - saveCenterWorkPerson( okrWorkPerson ); - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getCreatorName(), okrCenterWorkInfo.getCreatorIdentity(), okrCenterWorkInfo.getCreatorUnitName(), okrCenterWorkInfo.getCreatorTopUnitName(), "观察者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setWorkProcessStatus( okrCenterWorkInfo.getProcessStatus() ); - okrWorkPerson.setDiscription( "中心工作创建者" ); - saveCenterWorkPerson( okrWorkPerson ); - } - if( okrCenterWorkInfo.getDeployerName() != null && !okrCenterWorkInfo.getDeployerName().isEmpty() ){ - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getDeployerName(), okrCenterWorkInfo.getDeployerIdentity(), okrCenterWorkInfo.getDeployerUnitName(), okrCenterWorkInfo.getDeployerTopUnitName(), "部署者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setWorkProcessStatus( okrCenterWorkInfo.getProcessStatus() ); - saveCenterWorkPerson( okrWorkPerson ); - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getDeployerName(), okrCenterWorkInfo.getDeployerIdentity(), okrCenterWorkInfo.getDeployerUnitName(), okrCenterWorkInfo.getDeployerTopUnitName(), "观察者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setWorkProcessStatus( okrCenterWorkInfo.getProcessStatus() ); - okrWorkPerson.setDiscription( "中心工作部署者" ); - saveCenterWorkPerson( okrWorkPerson ); - } - -// if( ListTools.isNotEmpty( okrCenterWorkInfo.getAuditLeaderIdentityList() )){ -// String userName = null, unitName = null, topUnitName = null; -// for( String identity : okrCenterWorkInfo.getAuditLeaderIdentityList() ){ -// topUnitName = okrUserManagerService.getTopUnitNameByIdentity(identity); -// unitName = okrUserManagerService.getUnitNameByIdentity(identity); -// userName = okrUserManagerService.getPersonNameByIdentity (identity ); -// okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, userName, identity, unitName, topUnitName, "观察者", okrCenterWorkInfo.getCreateTime() ); -// okrWorkPerson.setWorkProcessStatus( okrCenterWorkInfo.getProcessStatus() ); -// okrWorkPerson.setDiscription( "中心工作阅知领导" ); -// saveCenterWorkPerson( okrWorkPerson ); -// } -// } - //为工作汇报审核领导添加观察权限 - if( ListTools.isNotEmpty( okrCenterWorkInfo.getReportAuditLeaderIdentityList() ) ){ - String userName = null, unitName = null, topUnitName = null; - for( String identity : okrCenterWorkInfo.getReportAuditLeaderIdentityList() ){ - topUnitName = okrUserManagerService.getTopUnitNameByIdentity(identity); - unitName = okrUserManagerService.getUnitNameByIdentity(identity); - userName = okrUserManagerService.getPersonNameByIdentity (identity ); - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, userName, identity, unitName, topUnitName, "观察者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setWorkProcessStatus( okrCenterWorkInfo.getProcessStatus() ); - okrWorkPerson.setDiscription( "中心工作汇报审核领导" ); - saveCenterWorkPerson( okrWorkPerson ); - } - } - } - - public void addWorkPersonToList( List okrWorkPersonList, OkrWorkPerson okrWorkPerson ){ - boolean exists = false; - for( OkrWorkPerson _okrWorkPerson : okrWorkPersonList){ - if( _okrWorkPerson.getWorkId() != null ){ - if( _okrWorkPerson.getWorkId().equals( okrWorkPerson.getWorkId()) - && _okrWorkPerson.getEmployeeIdentity().equals( okrWorkPerson.getEmployeeIdentity() ) - && _okrWorkPerson.getProcessIdentity().equals( okrWorkPerson.getProcessIdentity() ) - ){ - exists = true; - } - }else{ - if( _okrWorkPerson.getCenterId().equals( okrWorkPerson.getCenterId()) - && _okrWorkPerson.getEmployeeIdentity().equals( okrWorkPerson.getEmployeeIdentity() ) - && _okrWorkPerson.getProcessIdentity().equals( okrWorkPerson.getProcessIdentity() ) - ){ - exists = true; - } - } - } - if( !exists ){ - okrWorkPersonList.add( okrWorkPerson ); - } - } - - /** - * 根据工作信息来维护工作干系人 - * 为工作添加创建者，部署者，责任者，协助者，阅知者以及所有观察者 - * @param okrWorkBaseInfo - * @throws Exception - */ - public List getWorkPersonListByWorkBaseInfoForWorkSave( OkrWorkBaseInfo okrWorkBaseInfo ) throws Exception { - List okrWorkPersonList = new ArrayList(); - OkrWorkPerson okrWorkPerson = null; - if( okrWorkBaseInfo.getCreatorName() != null && !okrWorkBaseInfo.getCreatorName().isEmpty() ){ - okrWorkPerson = createWorkPersonByWorkInfo( okrWorkBaseInfo, okrWorkBaseInfo.getCreatorIdentity(), "创建者" ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - okrWorkPerson = createWorkPersonByWorkInfo( okrWorkBaseInfo, okrWorkBaseInfo.getCreatorIdentity(), "观察者" ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - } - if( okrWorkBaseInfo.getDeployerName() != null && !okrWorkBaseInfo.getDeployerName().isEmpty() ){ - okrWorkPerson = createWorkPersonByWorkInfo( okrWorkBaseInfo, okrWorkBaseInfo.getDeployerIdentity(), "部署者" ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - if( !okrWorkBaseInfo.getCreatorName().equals( okrWorkBaseInfo.getDeployerName() ) ){ - okrWorkPerson = createWorkPersonByWorkInfo( okrWorkBaseInfo, okrWorkBaseInfo.getDeployerIdentity(), "观察者" ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - } - } - return okrWorkPersonList; - } - - public Boolean addWatcherForWork( String workId, List watcherIdentities ) throws Exception { - OkrWorkBaseInfo okrWorkBaseInfo = null; - OkrWorkPerson okrWorkPerson = null; - List ids = null; - Business business = null; - if( ListTools.isEmpty(watcherIdentities )) { - return true; - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - okrWorkBaseInfo = emc.find( workId, OkrWorkBaseInfo.class ); - if( okrWorkBaseInfo == null ) { - throw new Exception("OkrWorkBaseInfo {'id':'"+workId+"'} not match!" ) ; - } - emc.beginTransaction(OkrWorkPerson.class); - for(String watcherIdentity : watcherIdentities) { - okrWorkPerson = createWorkPersonByWorkInfo( okrWorkBaseInfo, watcherIdentity, "观察者" ); - ids = business.okrWorkPersonFactory().listByWorkAndIdentity(okrWorkPerson.getCenterId(), - okrWorkPerson.getWorkId(), okrWorkPerson.getEmployeeIdentity(), - okrWorkPerson.getProcessIdentity(), null ); - if( ListTools.isEmpty( ids )) { - emc.persist(okrWorkPerson, CheckPersistType.all); - } - } - } catch ( Exception e ) { - throw e; - } - return true; - } - - - /** - * 根据中心工作信息来维护工作干系人 - * 为工作添加创建者，部署者以及所有观察者 - * @param okrCenterWorkInfo - * @throws Exception - */ - public List getWorkPersonListByCenterWorkInfo( OkrCenterWorkInfo okrCenterWorkInfo ) throws Exception { - List okrWorkPersonList = new ArrayList(); - OkrWorkPerson okrWorkPerson = null; - if( okrCenterWorkInfo.getCreatorName() != null && !okrCenterWorkInfo.getCreatorName().isEmpty() ){ - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getCreatorName(), okrCenterWorkInfo.getCreatorIdentity(), okrCenterWorkInfo.getCreatorUnitName(), okrCenterWorkInfo.getCreatorTopUnitName(), "创建者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setTopUnitName( okrCenterWorkInfo.getCreatorTopUnitName() ); - okrWorkPerson.setUnitName( okrCenterWorkInfo.getCreatorUnitName() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getCreatorName(), okrCenterWorkInfo.getCreatorIdentity(), okrCenterWorkInfo.getCreatorUnitName(), okrCenterWorkInfo.getCreatorTopUnitName(), "观察者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setTopUnitName( okrCenterWorkInfo.getCreatorTopUnitName() ); - okrWorkPerson.setUnitName( okrCenterWorkInfo.getCreatorUnitName() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - } - if( okrCenterWorkInfo.getDeployerName() != null && !okrCenterWorkInfo.getDeployerName().isEmpty() ){ - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getDeployerName(), okrCenterWorkInfo.getDeployerIdentity(), okrCenterWorkInfo.getDeployerUnitName(), okrCenterWorkInfo.getDeployerTopUnitName(), "部署者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setTopUnitName( okrCenterWorkInfo.getDeployerTopUnitName() ); - okrWorkPerson.setUnitName( okrCenterWorkInfo.getDeployerUnitName() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - if( !okrCenterWorkInfo.getCreatorName().equals( okrCenterWorkInfo.getDeployerName() ) ){ - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, okrCenterWorkInfo.getDeployerName(), okrCenterWorkInfo.getDeployerIdentity(), okrCenterWorkInfo.getDeployerUnitName(), okrCenterWorkInfo.getDeployerTopUnitName(), "观察者", okrCenterWorkInfo.getCreateTime() ); - okrWorkPerson.setTopUnitName( okrCenterWorkInfo.getDeployerTopUnitName() ); - okrWorkPerson.setUnitName( okrCenterWorkInfo.getDeployerUnitName() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - } - } - if( ListTools.isNotEmpty(okrCenterWorkInfo.getReportAuditLeaderNameList()) ){ - for( int i=0; i< okrCenterWorkInfo.getReportAuditLeaderNameList().size();i++) { - String identity = null; - String name = null; - String unitName = null; - String topUnitName = null; - if( okrCenterWorkInfo.getReportAuditLeaderNameList().size() > i ) { - identity = okrCenterWorkInfo.getReportAuditLeaderNameList().get(i); - } - if( okrCenterWorkInfo.getReportAuditLeaderIdentityList().size() > i ) { - name = okrCenterWorkInfo.getReportAuditLeaderIdentityList().get(i); - } - if( okrCenterWorkInfo.getReportAuditLeaderUnitNameList().size() > i ) { - unitName = okrCenterWorkInfo.getReportAuditLeaderUnitNameList().get(i); - } - if( okrCenterWorkInfo.getReportAuditLeaderTopUnitNameList().size() > i ) { - topUnitName = okrCenterWorkInfo.getReportAuditLeaderTopUnitNameList().get(i); - } - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, name, identity, unitName, topUnitName, "审核者", okrCenterWorkInfo.getCreateTime() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - if( !okrCenterWorkInfo.getCreatorName().equals( name ) ){ - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, name, identity, unitName, topUnitName, "观察者", okrCenterWorkInfo.getCreateTime() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - } - } - } - - String userName = null, unitName = null, topUnitName = null; - if( ListTools.isNotEmpty( okrCenterWorkInfo.getDefaultLeaderIdentityList() ) ){ - for( String identityName : okrCenterWorkInfo.getDefaultLeaderIdentityList() ){ - if( okrUserManagerService.getPersonNameByIdentity( identityName ) == null ){ - throw new Exception( "person not exsits, identity:" + identityName ); - } - userName = okrUserManagerService.getPersonNameByIdentity(identityName); - unitName = okrUserManagerService.getUnitNameByIdentity(identityName); - topUnitName = okrUserManagerService.getTopUnitNameByIdentity(identityName); - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, userName, identityName, unitName, topUnitName, "阅知者", okrCenterWorkInfo.getCreateTime() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - okrWorkPerson = createWorkPersonByCenterInfo( okrCenterWorkInfo, userName, identityName, unitName, topUnitName, "观察者", okrCenterWorkInfo.getCreateTime() ); - addWorkPersonToList( okrWorkPersonList, okrWorkPerson ); - } - } - return okrWorkPersonList; - } - - /** - * 根据中心工作ID，姓名，身份来创建一个干系人信息 - * @param id - * @param creatorName - * @param string - * @throws Exception - */ - public OkrWorkPerson createWorkPersonByCenterInfo_test111( String centerId, String employeeIdentityName, String processIdentity, Date createTime) throws Exception { - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, return null!" ); - } - if( employeeIdentityName == null || employeeIdentityName.isEmpty() ){ - throw new Exception( "employeeIdentityName is null, return null!" ); - } - if( processIdentity == null || processIdentity.isEmpty() ){ - throw new Exception( "processIdentity is null, return null!" ); - } - OkrCenterWorkInfo okrCenterWorkInfo = null; - String userName = null, unitName = null, topUnitName = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrCenterWorkInfo = emc.find( centerId, OkrCenterWorkInfo.class ); - }catch( Exception e ){ - throw e; - } - if( okrCenterWorkInfo == null ){ - throw new Exception( "okrCenterWorkInfo{'id':'"+centerId+"'} is not exists." ); - }else{ - userName = okrUserManagerService.getPersonNameByIdentity(employeeIdentityName); - unitName = okrUserManagerService.getUnitNameByIdentity(employeeIdentityName); - topUnitName = okrUserManagerService.getTopUnitNameByIdentity(employeeIdentityName); - return createWorkPersonByCenterInfo( okrCenterWorkInfo, userName, employeeIdentityName, unitName, topUnitName, processIdentity, createTime ); - } - } - - /** - * 根据中心工作ID，姓名，身份来创建一个干系人信息 - * @param id - * @param creatorName - * @param string - * @throws Exception - */ - public OkrWorkPerson createWorkPersonByCenterInfo( OkrCenterWorkInfo okrCenterWorkInfo, String employeeName, String employeeIdentity, String employeeUnitName, String empoyeeTopUnit, String processIdentity, Date createTime) throws Exception { - String deployYear = null, deployMonth = null; - Date now = new Date(); - if( okrCenterWorkInfo == null ){ - throw new Exception( " okrCenterWorkInfo id is null, can not create new OkrWorkPerson!" ); - } - if( employeeName == null ){ - throw new Exception( " employeeName is null, can not create new OkrWorkPerson!" ); - } - if( employeeIdentity == null ){ - throw new Exception( " employeeIdentity is null, can not create new OkrWorkPerson!" ); - } - if( employeeUnitName == null ){ - throw new Exception( " employeeUnitName is null, can not create new OkrWorkPerson!" ); - } - if( empoyeeTopUnit == null ){ - throw new Exception( " empoyeeTopUnit is null, can not create new OkrWorkPerson!" ); - } - if( processIdentity == null ){ - throw new Exception( " processIdentity is null, can not create new OkrWorkPerson!" ); - } - if( createTime == null ){ - createTime = new Date(); - } - try{ - deployYear = dateOperation.getYear( createTime ); - deployMonth = dateOperation.getMonth( createTime ); - if( "0".equals( deployYear ) ){ - deployYear = dateOperation.getYear( now ); - deployMonth = dateOperation.getMonth( now ); - } - }catch(Exception e){ - logger.warn( "system get year and month from createtime got an exception: " ); - return null; - } - - //根据以上信息创建一个新的工作干系人信息对象 - OkrWorkPerson okrWorkPerson = new OkrWorkPerson(); - okrWorkPerson.setCenterId( okrCenterWorkInfo.getId() ); - okrWorkPerson.setCenterTitle( okrCenterWorkInfo.getTitle() ); - okrWorkPerson.setEmployeeName(employeeName); - okrWorkPerson.setEmployeeIdentity(employeeIdentity); - okrWorkPerson.setUnitName( employeeUnitName ); - okrWorkPerson.setTopUnitName(empoyeeTopUnit); - okrWorkPerson.setDeployMonth(deployMonth); - okrWorkPerson.setDeployYear(deployYear); - - okrWorkPerson.setDeployDateStr( okrCenterWorkInfo.getDeployDateStr() ); - if( okrCenterWorkInfo.getCreateTime() != null ){ - okrWorkPerson.setWorkCreateDateStr( dateOperation.getDateStringFromDate( okrCenterWorkInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - }else{ - okrWorkPerson.setWorkCreateDateStr( dateOperation.getDateStringFromDate( new Date(), "yyyy-MM-dd HH:mm:ss")); - } - okrWorkPerson.setCompleteDateLimitStr( okrCenterWorkInfo.getDefaultCompleteDateLimitStr() ); - okrWorkPerson.setCompleteDateLimit( okrCenterWorkInfo.getDefaultCompleteDateLimit() ); - okrWorkPerson.setRecordType( "中心工作" ); - - okrWorkPerson.setProcessIdentity( processIdentity ); - okrWorkPerson.setIsDelegateTarget( false ); - okrWorkPerson.setIsOverTime( false ); - okrWorkPerson.setStatus( "正常" ); - okrWorkPerson.setWorkId( null ); - okrWorkPerson.setWorkTitle( null ); - okrWorkPerson.setWorkType( okrCenterWorkInfo.getDefaultWorkType() ); - okrWorkPerson.setWorkLevel( okrCenterWorkInfo.getDefaultWorkLevel() ); - okrWorkPerson.setViewTime( null ); - okrWorkPerson.setIsCompleted( false ); - okrWorkPerson.setParentWorkId( null ); - okrWorkPerson.setWorkDateTimeType( null ); - okrWorkPerson.setWorkProcessStatus( null); - return okrWorkPerson; - } - - /** - * 根据中心工作ID，工作ID，姓名，身份来创建一个干系人信息 - * @param centerId - * @param workId - * @param creatorName - * @param string - * @throws Exception - */ - public OkrWorkPerson createWorkPersonByWorkInfo( OkrWorkBaseInfo okrWorkBaseInfo, String employeeIdentity, String processIdentity ) throws Exception { - String deployYear = null, deployMonth = null; - if( okrWorkBaseInfo == null ){ - throw new Exception( " okrWorkBaseInfo is null, can not create new OkrWorkPerson!" ); - } - if( employeeIdentity == null ){ - throw new Exception( " employeeIdentity is null, can not create new OkrWorkPerson!" ); - } - if( processIdentity == null ){ - throw new Exception( " processIdentity is null, can not create new OkrWorkPerson!" ); - } - - Date createTime = new Date(); - String personName = null; - personName = okrUserManagerService.getPersonNameByIdentity( employeeIdentity ); - if( personName != null ){ - String employeeUnitName = okrUserManagerService.getUnitNameByIdentity( employeeIdentity ); - String empoyeeTopUnit = okrUserManagerService.getTopUnitNameByIdentity( employeeIdentity ); - try{ - deployYear = dateOperation.getYear( createTime ); - deployMonth = dateOperation.getMonth( createTime ); - }catch(Exception e){ - logger.warn( "system get year and month from createtime got an exception: " ); - return null; - } - //根据以上信息创建一个新的工作干系人信息对象 - OkrWorkPerson okrWorkPerson = new OkrWorkPerson(); - okrWorkPerson.setCenterId( okrWorkBaseInfo.getCenterId() ); - okrWorkPerson.setCenterTitle( okrWorkBaseInfo.getCenterTitle() ); - okrWorkPerson.setEmployeeIdentity( employeeIdentity ); - okrWorkPerson.setEmployeeName( personName ); - okrWorkPerson.setUnitName( employeeUnitName ); - okrWorkPerson.setTopUnitName( empoyeeTopUnit ); - okrWorkPerson.setDeployMonth( deployMonth ); - okrWorkPerson.setDeployYear( deployYear ); - - okrWorkPerson.setDeployDateStr( okrWorkBaseInfo.getDeployDateStr() ); - if( okrWorkBaseInfo.getCreateTime() != null ){ - okrWorkPerson.setWorkCreateDateStr( dateOperation.getDateStringFromDate( okrWorkBaseInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - }else{ - okrWorkPerson.setWorkCreateDateStr( dateOperation.getDateStringFromDate( new Date(), "yyyy-MM-dd HH:mm:ss")); - } - okrWorkPerson.setCompleteDateLimitStr( okrWorkBaseInfo.getCompleteDateLimitStr() ); - okrWorkPerson.setCompleteDateLimit( okrWorkBaseInfo.getCompleteDateLimit() ); - okrWorkPerson.setRecordType( "具体工作" ); - - okrWorkPerson.setProcessIdentity( processIdentity ); - okrWorkPerson.setIsOverTime( okrWorkBaseInfo.getIsOverTime() ); - okrWorkPerson.setWorkId( okrWorkBaseInfo.getId() ); - okrWorkPerson.setWorkTitle( okrWorkBaseInfo.getTitle() ); - okrWorkPerson.setWorkType( okrWorkBaseInfo.getWorkType() ); - okrWorkPerson.setWorkLevel( okrWorkBaseInfo.getWorkLevel() ); - okrWorkPerson.setIsCompleted( okrWorkBaseInfo.getIsCompleted() ); - okrWorkPerson.setParentWorkId( okrWorkBaseInfo.getParentWorkId() ); - okrWorkPerson.setWorkDateTimeType( okrWorkBaseInfo.getWorkDateTimeType() ); - okrWorkPerson.setWorkProcessStatus( okrWorkBaseInfo.getWorkProcessStatus() ); - okrWorkPerson.setViewTime( null ); - okrWorkPerson.setIsDelegateTarget( false ); - okrWorkPerson.setStatus( "正常" ); - return okrWorkPerson; - }else{ - throw new Exception( "user not exsits: " + employeeIdentity ); - } - } - - /** - * 根据指定的IDS获取对象列表 - * @param ids - * @return - * @throws Exception - */ - public List listByIds( List ids ) throws Exception { - Business business = null; - if( ids == null || ids.size() == 0 ){ - return null; - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().list( ids ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据中心工作ID，获取该中心工作信息（不包括下级工作信息）所有的干系人信息 - * 中心工作信息的干系人信息，workId为空 - * @param id - * @return - * @throws Exception - */ - public List listIdsForCenterWorkByCenterId( String centerId, List statuses ) throws Exception { - Business business = null; - if( centerId == null || centerId.isEmpty() ){ - throw new Exception( "centerId is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listIdsForCenterWorkByCenterId( centerId, null, null, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID，获取该工作信息（不包括下级工作信息）所有的干系人信息 - * 中心工作信息的干系人信息，workId为空 - * @param id - * @return - * @throws Exception - */ - public List listIdsForWork( String workId, List statuses ) throws Exception { - Business business = null; - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listByWorkId( workId, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - public List listIdsByWorkAndUserIdentity( String workId, String userIdentity, List statuses ) throws Exception { - Business business = null; - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not query any object." ); - } - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception( "userIdentity is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listByWorkIdAndUserIdentity( workId, userIdentity, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - public List listDistinctIdentity() throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctIdentity(); - } catch ( Exception e ) { - throw e; - } - } - - public List listCenterWorkIdsByWorkType( List workTypeName, String loginIdentity, String processIdentity ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listCenterWorkIdsByWorkType( workTypeName, loginIdentity, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public List listByWorkAndIdentity( String centerId, String workId, String employeeIdentity, String processIdentity, List statuses) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listByWorkAndIdentity( centerId, workId, employeeIdentity, processIdentity, statuses); - } catch ( Exception e ) { - throw e; - } - } - - public List listDistinctWorkIdsByWorkAndIdentity( String centerId, String workId, String employeeIdentity, String processIdentity, List statuses) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctWorkIdsByWorkAndIdentity( centerId, workId, employeeIdentity, processIdentity, statuses); - } catch ( Exception e ) { - throw e; - } - } - - public List list(List ids) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().list(ids); - } catch ( Exception e ) { - throw e; - } - } - - public List listByAuthorizeRecordIds(List authorizeRecordIds, List statuses ) throws Exception { - Business business = null; - if( authorizeRecordIds == null || authorizeRecordIds.isEmpty() ){ - throw new Exception( "authorizeRecordIds is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listByAuthorizeRecordIds( authorizeRecordIds, statuses ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * - * @param centerId - * @param identity - * @param processIdentity - * @param notInCenterIds 排除的中心工作ID - * @return - * @throws Exception - */ - public List listDistinctWorkIdsByPersonIndentity( String centerId, String identity, String processIdentity, List notInCenterIds) throws Exception { - Business business = null; - if( identity == null || identity.isEmpty() ){ - throw new Exception( "identity is null, system can not query any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listDistinctWorkIdsByPersonIndentity( centerId, identity, processIdentity, notInCenterIds ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getWorkTotalByCenterId( String identity, List status, String processIdentity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getWorkTotalByCenterId( identity, status, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getProcessingWorkCountByCenterId(String identity, List status, String processIdentity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getProcessingWorkCountByCenterId( identity, status, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getCompletedWorkCountByCenterId(String identity, List status, String processIdentity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getCompletedWorkCountByCenterId( identity, status, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getOvertimeWorkCountByCenterId(String identity, List status, String processIdentity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getOvertimeWorkCountByCenterId( identity, status, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getOvertimenessWorkCountByCenterId(String identity, List status, String processIdentity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getOvertimenessWorkCountByCenterId( identity, status, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public Long getDraftWorkCountByCenterId(String identity, List status, String processIdentity) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().getDraftWorkCountByCenterId( identity, status, processIdentity ); - } catch ( Exception e ) { - throw e; - } - } - - public OkrWorkPerson createCenterWorkPersonByWorkPersonInfo( OkrWorkPerson workPerson, String processIdentity, Date createTime ) throws Exception { - if( workPerson == null ){ - return null; - } - String deployYear = null, deployMonth = null; - Date now = new Date(); - OkrCenterWorkInfo okrCenterWorkInfo = null; - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - okrCenterWorkInfo = business.okrCenterWorkInfoFactory().get( workPerson.getCenterId() ); - if( okrCenterWorkInfo == null ){ - throw new Exception("center work is not exists.id:" + workPerson.getCenterId() ); - } - } catch ( Exception e ) { - throw e; - } - - try{ - deployYear = dateOperation.getYear( createTime ); - deployMonth = dateOperation.getMonth( createTime ); - if( "0".equals( deployYear ) ){ - deployYear = dateOperation.getYear( now ); - deployMonth = dateOperation.getMonth( now ); - } - }catch(Exception e){ - logger.warn( "system get year and month from createtime got an exception: " ); - return null; - } - - //根据以上信息创建一个新的工作干系人信息对象 - OkrWorkPerson okrWorkPerson = new OkrWorkPerson(); - okrWorkPerson.setCenterId( workPerson.getCenterId() ); - okrWorkPerson.setCenterTitle( workPerson.getCenterTitle() ); - okrWorkPerson.setEmployeeName( workPerson.getEmployeeName() ); - okrWorkPerson.setEmployeeIdentity( workPerson.getEmployeeIdentity() ); - okrWorkPerson.setUnitName( workPerson.getUnitName() ); - okrWorkPerson.setTopUnitName( workPerson.getTopUnitName() ); - okrWorkPerson.setDeployMonth( deployMonth ); - okrWorkPerson.setDeployYear( deployYear ); - - okrWorkPerson.setDeployDateStr( okrCenterWorkInfo.getDeployDateStr() ); - if( okrCenterWorkInfo.getCreateTime() != null ){ - okrWorkPerson.setWorkCreateDateStr( dateOperation.getDateStringFromDate( okrCenterWorkInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - }else{ - okrWorkPerson.setWorkCreateDateStr( dateOperation.getDateStringFromDate( new Date(), "yyyy-MM-dd HH:mm:ss")); - } - okrWorkPerson.setCompleteDateLimitStr( okrCenterWorkInfo.getDefaultCompleteDateLimitStr() ); - okrWorkPerson.setCompleteDateLimit( okrCenterWorkInfo.getDefaultCompleteDateLimit() ); - okrWorkPerson.setRecordType( "中心工作" ); - - if( processIdentity != null && !processIdentity.isEmpty() ){ - okrWorkPerson.setProcessIdentity( processIdentity ); - }else{ - okrWorkPerson.setProcessIdentity( workPerson.getProcessIdentity() ); - } - okrWorkPerson.setIsDelegateTarget( false ); - okrWorkPerson.setIsOverTime( false ); - okrWorkPerson.setStatus( "正常" ); - okrWorkPerson.setWorkId( null ); - okrWorkPerson.setWorkTitle( null ); - okrWorkPerson.setWorkType( okrCenterWorkInfo.getDefaultWorkType() ); - okrWorkPerson.setWorkLevel( okrCenterWorkInfo.getDefaultWorkLevel() ); - okrWorkPerson.setViewTime( null ); - okrWorkPerson.setIsCompleted( false ); - okrWorkPerson.setParentWorkId( null ); - okrWorkPerson.setWorkDateTimeType( null ); - okrWorkPerson.setWorkProcessStatus( "执行中" ); - return okrWorkPerson; - } - - public List listWorkPersonIdentitiesWithWorkId(String workId) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkPersonFactory().listAllDistinctIdentityWithWorkId(workId); - } catch ( Exception e ) { - throw e; - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkProcessIdentityService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkProcessIdentityService.java deleted file mode 100644 index c667d7f07a..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkProcessIdentityService.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.List; - -public class OkrWorkProcessIdentityService { - - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - - /** - * 判断一个工作是否是用户阅知的工作, 用户是否在工作的干系人身份中拥有阅知者身份 - * @param workId - * @return - * @throws Exception - */ - public Boolean isMyReadWork( String userIdentity, String workId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( null, workId, userIdentity, "阅知者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - - public boolean isMyCooperateWork( String userIdentity, String workId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( null, workId, userIdentity, "协助者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - - public boolean isMyResponsibilityWork( String userIdentity, String workId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( null, workId, userIdentity, "责任者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - - public boolean isMyAuthorizeWork(String userIdentity, String workId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( null, workId, userIdentity, "授权者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - - public boolean isMyDeployWork(String userIdentity, String workId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( workId == null || workId.isEmpty() ){ - throw new Exception("workId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( null, workId, userIdentity, "部署者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - - /** - * 判断一个工作是否是用户阅知的工作, 用户是否在工作的干系人身份中拥有阅知者身份 - * @param workId - * @return - * @throws Exception - */ - public Boolean isMyReadCenter( String userIdentity, String centerId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( centerId == null || centerId.isEmpty() ){ - throw new Exception("centerId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( centerId, null, userIdentity, "阅知者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - - public boolean isMyDeployCenter(String userIdentity, String centerId ) throws Exception { - if( userIdentity == null || userIdentity.isEmpty() ){ - throw new Exception("user identity is null, can not query work person."); - } - if( centerId == null || centerId.isEmpty() ){ - throw new Exception("centerId is null, can not query work person."); - } - List ids = okrWorkPersonService.listByWorkAndIdentity( centerId, null, userIdentity, "部署者", null ); - if( ids != null && !ids.isEmpty() ){ - return true; - } - return false; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportDetailInfoService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportDetailInfoService.java deleted file mode 100644 index d312d9e8c3..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportDetailInfoService.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.x.okr.assemble.control.service; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.entity.OkrWorkReportDetailInfo; - -/** - * 类 名：OkrWorkReportDetailInfoService
- * 实体类：OkrWorkReportDetailInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportDetailInfoService{ - - private static Logger logger = LoggerFactory.getLogger( OkrWorkReportDetailInfoService.class ); - - /** - * 根据传入的ID从数据库查询OkrWorkReportDetailInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkReportDetailInfo get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrWorkReportDetailInfo.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrWorkReportDetailInfo对象 - * @param wrapIn - */ - public OkrWorkReportDetailInfo save( OkrWorkReportDetailInfo wrapIn ) throws Exception { - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkReportDetailInfo = emc.find( wrapIn.getId(), OkrWorkReportDetailInfo.class ); - if( okrWorkReportDetailInfo != null ){ - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - wrapIn.copyTo( okrWorkReportDetailInfo, JpaObject.FieldsUnmodify ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - emc.commit(); - }else{ - okrWorkReportDetailInfo = new OkrWorkReportDetailInfo(); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - wrapIn.copyTo( okrWorkReportDetailInfo ); - okrWorkReportDetailInfo.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrWorkReportDetailInfo, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrWorkReportDetailInfo update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkReportDetailInfo = new OkrWorkReportDetailInfo(); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - wrapIn.copyTo( okrWorkReportDetailInfo ); - emc.persist( okrWorkReportDetailInfo, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkReportDetailInfo create got a error!", e); - throw e; - } - } - return okrWorkReportDetailInfo; - } - - /** - * 根据ID从数据库中删除OkrWorkReportDetailInfo对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkReportDetailInfo = emc.find(id, OkrWorkReportDetailInfo.class); - if (null == okrWorkReportDetailInfo) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.remove( okrWorkReportDetailInfo, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportFlowService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportFlowService.java deleted file mode 100644 index 6d91973907..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportFlowService.java +++ /dev/null @@ -1,1381 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -/** - * 类 名：OkrWorkReportBaseInfoService
- * 实体类：OkrWorkReportBaseInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportFlowService{ - private static Logger logger = LoggerFactory.getLogger( OkrWorkReportFlowService.class ); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - private OkrTaskService okrTaskService = new OkrTaskService(); - private DateOperation dateOperation = new DateOperation(); - private OkrConfigSystemService okrConfigSystemService = new OkrConfigSystemService(); - private OkrWorkReportPersonLinkService okrWorkReportPersonLinkService = new OkrWorkReportPersonLinkService(); - private OkrWorkReportProcessLogService okrWorkReportProcessLogService = new OkrWorkReportProcessLogService(); - private OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - - /** - * 根据工作ID，查询该工作的最大汇报次序 - * @param id - * @return - * @throws Exception - */ - public Integer getMaxReportCount( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().getMaxReportCount( workId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 领导审批工作汇报 - * @param name - * @param wrapIn - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo adminProcess( OkrWorkReportBaseInfo okrWorkReportBaseInfo, String adminSuperviseInfo, String userIdentity ) throws Exception { - if( okrWorkReportBaseInfo == null ){ - throw new Exception( "okrWorkReportBaseInfo is null." ); - } - if( adminSuperviseInfo == null || adminSuperviseInfo.isEmpty() ){ - throw new Exception( "adminSuperviseInfo id is null, can not process report info." ); - } - if( userIdentity == null ){ - throw new Exception( "userIdentity id is null, can not process report info." ); - } - Business business = null; - Date taskArriveDate = null; - String taskArriveDateString = null; - Boolean isWorkCompleted = false; - Integer progressPercent = 0; - Integer processLevel = 0; - Integer maxProcessLevel = 0; - OkrTask okrTask = null; - OkrTask _okrTask = null; - OkrTaskHandled okrTaskHandled = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - OkrWorkReportPersonLink _okrWorkReportPersonLink = null; - List ids = null; - List taskIds = null; - List taskList = new ArrayList<>(); - List taskHandledList = new ArrayList<>(); - List next_okrWorkReportPersonLinkList = null; - - String processorName = okrUserManagerService.getPersonNameByIdentity(userIdentity); - - isWorkCompleted = okrWorkReportBaseInfo.getIsWorkCompleted(); - progressPercent = okrWorkReportBaseInfo.getProgressPercent(); - if( isWorkCompleted ) { - progressPercent = 100; - } - if( progressPercent == 100 ) { - isWorkCompleted = true; - } - okrWorkReportBaseInfo.setIsWorkCompleted( isWorkCompleted ); - okrWorkReportBaseInfo.setProgressPercent( progressPercent ); - if( processorName != null ){ - //二、处理本层级的处理人处理信息以及待办信息删除，新增已办信息 - //获取汇报信息当前的处理级别 - processLevel = okrWorkReportBaseInfo.getCurrentProcessLevel(); - //logger.debug( "okrWorkReportBaseInfo.getCurrentProcessLevel() : " + okrWorkReportBaseInfo.getCurrentProcessLevel()); - //查询本处理层级的处理人信息，更新处理状态为已处理 - ids = okrWorkReportPersonLinkService.getProcessPersonLinkInfoByReportAndLevel( okrWorkReportBaseInfo.getId(), processLevel, userIdentity, "处理中", "正常" ); - //logger.debug( "ids.size() : " + ids.size() ); - //查询该次处理的待办信息 - taskIds = okrTaskService.listIdsByTargetActivityAndObjId( "工作汇报", okrWorkReportBaseInfo.getId(), okrWorkReportBaseInfo.getActivityName(), userIdentity ); - - //获取该汇报的最大审批等级 - maxProcessLevel = okrWorkReportPersonLinkService.getMaxProcessLevel( okrWorkReportBaseInfo.getId() ); - if( maxProcessLevel == null || maxProcessLevel <= 0 ){ - throw new Exception( "okrWorkReportBaseInfo{'id':'"+okrWorkReportBaseInfo.getId()+"'} can not find any processor in person link." ); - } - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - - //更新处理状态为处理中 - if( ids != null && !ids.isEmpty() ){ - for( String id : ids ){ - _okrWorkReportPersonLink = emc.find( id, OkrWorkReportPersonLink.class ); - _okrWorkReportPersonLink.setProcessStatus( "已处理" ); - emc.check( _okrWorkReportPersonLink, CheckPersistType.all ); - } - } - //添加已办，删除待办 - if( taskIds != null && !taskIds.isEmpty() ){ - for( String id : taskIds ){ - _okrTask = emc.find( id, OkrTask.class ); - if( _okrTask != null ){ - taskArriveDate = _okrTask.getArriveDateTime(); - taskArriveDateString = _okrTask.getArriveDateTimeStr(); - //生成已办信息 - okrTaskHandled = new OkrTaskHandled(); - okrTaskHandled.setActivityName( _okrTask.getActivityName() ); - okrTaskHandled.setArriveDateTime( _okrTask.getArriveDateTime() ); - okrTaskHandled.setArriveDateTimeStr( _okrTask.getArriveDateTimeStr() ); - okrTaskHandled.setCenterId( _okrTask.getCenterId() ); - okrTaskHandled.setCenterTitle( _okrTask.getCenterTitle() ); - okrTaskHandled.setDynamicObjectId( _okrTask.getDynamicObjectId() ); - okrTaskHandled.setDynamicObjectTitle( _okrTask.getDynamicObjectTitle() ); - okrTaskHandled.setDynamicObjectType( _okrTask.getDynamicObjectType() ); - okrTaskHandled.setProcessDateTime( new Date() ); - okrTaskHandled.setProcessDateTimeStr( dateOperation.getNowDateTime() ); - okrTaskHandled.setTargetTopUnitName( _okrTask.getTargetTopUnitName() ); - okrTaskHandled.setTargetIdentity( _okrTask.getTargetIdentity() ); - okrTaskHandled.setTargetName( _okrTask.getTargetName() ); - okrTaskHandled.setTargetUnitName( _okrTask.getTargetUnitName() ); - okrTaskHandled.setTitle( _okrTask.getTitle() ); - okrTaskHandled.setWorkType( _okrTask.getWorkType() ); - okrTaskHandled.setViewUrl( "" ); - okrTaskHandled.setWorkId( _okrTask.getWorkId() ); - okrTaskHandled.setWorkTitle( _okrTask.getWorkTitle() ); - taskHandledList.add( okrTaskHandled ); - //保存已办 - emc.persist( okrTaskHandled, CheckPersistType.all ); - //删除待办 - emc.remove( _okrTask, CheckRemoveType.all ); - taskList.add( _okrTask ); - } - } - } - if( taskArriveDate == null ){ - taskArriveDate = new Date(); - taskArriveDateString = dateOperation.getNowDateTime(); - } - //一、记录督办意见和处理日志 - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - okrWorkReportProcessLog.setActivityName( okrWorkReportBaseInfo.getActivityName() ); - okrWorkReportProcessLog.setArriveTime( taskArriveDate ); - okrWorkReportProcessLog.setArriveTimeStr( taskArriveDateString ); - okrWorkReportProcessLog.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrWorkReportProcessLog.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportProcessLog.setDecision( "提交" ); - okrWorkReportProcessLog.setOpinion( adminSuperviseInfo ); - okrWorkReportProcessLog.setProcessLevel( processLevel ); - okrWorkReportProcessLog.setProcessTime( new Date() ); - okrWorkReportProcessLog.setProcessTimeStr( dateOperation.getNowDateTime() ); - okrWorkReportProcessLog.setReportTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setStayTime( 0L ); - okrWorkReportProcessLog.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportProcessLog.setProcessStatus( "已生效" ); - okrWorkReportProcessLog.setWorkReportId( okrWorkReportBaseInfo.getId() ); - okrWorkReportProcessLog.setProcessorName( processorName ); - okrWorkReportProcessLog.setProcessorUnitName( okrUserManagerService.getUnitNameByIdentity(userIdentity) ); - okrWorkReportProcessLog.setProcessorIdentity( userIdentity ); - okrWorkReportProcessLog.setProcessorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(userIdentity) ); - //保存处理记录 - emc.persist( okrWorkReportProcessLog, CheckPersistType.all ); - emc.commit(); - }catch ( Exception e ) { - throw e; - } - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - okrWorkReportBaseInfo = emc.find( okrWorkReportBaseInfo.getId(), OkrWorkReportBaseInfo.class ); - okrWorkReportDetailInfo = emc.find( okrWorkReportBaseInfo.getId(), OkrWorkReportDetailInfo.class ); - if( okrWorkReportDetailInfo != null ){ - okrWorkReportDetailInfo.setAdminSuperviseInfo( adminSuperviseInfo ); - } - - //三、查询本层是否还有用户未处理，如果没有就准备发送下一个级别的待办 - ids = business.okrWorkReportPersonLinkFactory().getProcessPersonLinkInfoByReportAndLevel( okrWorkReportBaseInfo.getId(), processLevel, null, "处理中", "正常" ); - if( ids == null || ids.isEmpty() ){//该环节已经没有处理人了，准备处理下一层级 - //根据当前环节查询汇报的下一批处理人，可能是一个，也可能是多个 - //根据汇报当前的处理级别来计算下一个级别代号 - //下一个处理级别是 prcessLevel+1 - processLevel++; - //查询下一个层级的所有处理人 - do{//根据汇报ID和需要的处理级别查询所有的处理人信息 - ids = business.okrWorkReportPersonLinkFactory().getProcessPersonLinkInfoByReportAndLevel( okrWorkReportBaseInfo.getId(), processLevel, null, "待处理", "正常" ); - if( ids != null && !ids.isEmpty()){ - break; - }else{ - processLevel++ ; - } - }while( processLevel < maxProcessLevel || ( ids!=null && !ids.isEmpty()) ); - okrWorkReportBaseInfo.setCurrentProcessLevel( processLevel ); - - //根据ID列表获取所有的处理人信息，更新处理状态为处理中 - next_okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list( ids ); - - //当前是督办人处理, - //如果存在下一步处理人(审阅领导)就对所有的领导发送待办, - //如果没有下一步处理人,就直接向汇报者发送待阅,通知汇报处理完成 - if( next_okrWorkReportPersonLinkList != null && !next_okrWorkReportPersonLinkList.isEmpty() ){ - okrWorkReportBaseInfo.setCurrentProcessorNameList( new ArrayList<>() ); - okrWorkReportBaseInfo.setCurrentProcessorIdentityList( new ArrayList<>() ); - okrWorkReportBaseInfo.setCurrentProcessorUnitNameList( new ArrayList<>() ); - okrWorkReportBaseInfo.setCurrentProcessorTopUnitNameList( new ArrayList<>() ); - - for( OkrWorkReportPersonLink okrWorkReportPersonLink : next_okrWorkReportPersonLinkList ){ - okrWorkReportBaseInfo.setActivityName( okrWorkReportPersonLink.getActivityName() ); - okrWorkReportBaseInfo.setProcessStatus( okrWorkReportPersonLink.getActivityName() ); - okrWorkReportBaseInfo.setCurrentProcessLevel(processLevel); - okrWorkReportBaseInfo.getCurrentProcessorNameList().add(okrWorkReportPersonLink.getProcessorName() ); - okrWorkReportBaseInfo.getCurrentProcessorIdentityList().add( okrWorkReportPersonLink.getProcessorIdentity() ); - okrWorkReportBaseInfo.getCurrentProcessorUnitNameList().add( okrWorkReportPersonLink.getProcessorUnitName() ); - okrWorkReportBaseInfo.getCurrentProcessorTopUnitNameList().add( okrWorkReportPersonLink.getProcessorTopUnitName() ); - - //更新处理状态为处理中 - okrWorkReportPersonLink.setProcessStatus( "处理中" ); - //发送待办信息 - okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrTask.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrTask.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrTask.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle() ); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType() ); - okrTask.setTargetIdentity( okrWorkReportPersonLink.getProcessorIdentity() ); - okrTask.setTargetName( okrWorkReportPersonLink.getProcessorName() ); - okrTask.setTargetUnitName( okrWorkReportPersonLink.getProcessorUnitName() ); - okrTask.setTargetTopUnitName( okrWorkReportPersonLink.getProcessorTopUnitName() ); - okrTask.setActivityName( okrWorkReportPersonLink.getActivityName() ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getNowDateTime() ); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId() ); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setDynamicObjectType( "工作汇报" ); - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - taskList.add( okrTask ); - } - }else{ - //没有查询到需要处理的下级处理人，那么汇报已经审阅完成 - okrWorkReportBaseInfo.setProcessStatus( "已完成" ); - okrWorkReportBaseInfo.setActivityName( "已完成" ); - okrWorkReportBaseInfo.setCurrentProcessLevel(processLevel); - okrWorkReportBaseInfo.setCurrentProcessorTopUnitNameList( new ArrayList<>() ); - okrWorkReportBaseInfo.setCurrentProcessorIdentityList( new ArrayList<>() ); - okrWorkReportBaseInfo.setCurrentProcessorNameList( new ArrayList<>() ); - okrWorkReportBaseInfo.setCurrentProcessorUnitNameList( new ArrayList<>() ); - } - }else{ - logger.debug( "本等级还有其他人员未完成处理，不需要处理下一审批层级的信息。" ); - } - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - emc.commit(); - } catch ( Exception e ) { - throw e; - } - }else{ - throw new Exception( "处理者不存在，身份：" + userIdentity); - } - if( taskList != null && taskList.size() > 0 ){ - for( OkrTask task : taskList ){ - List workTypeList = new ArrayList(); - workTypeList.add( task.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( task.getTargetIdentity(), workTypeList ); - } - for( OkrTaskHandled taskHandled : taskHandledList ){ - List workTypeList = new ArrayList(); - workTypeList.add( taskHandled.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( taskHandled.getTargetIdentity(), workTypeList ); - } - } - return okrWorkReportBaseInfo; - } - - /** - * 领导审批工作汇报 - * @param name - * @param wrapIn - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo leaderProcess( OkrWorkReportBaseInfo okrWorkReportBaseInfo, String opinion, String userIdentity ) throws Exception { - if( okrWorkReportBaseInfo == null ){ - throw new Exception( "okrWorkReportBaseInfo is null." ); - } - if( opinion == null || opinion.isEmpty() ){ - throw new Exception( "opinion id is null, can not process report info." ); - } - if( userIdentity == null ){ - throw new Exception( "userIdentity id is null, can not process report info." ); - } - Business business = null; - Date taskArriveDate = null; - String taskArriveDateString = null; - Integer processLevel = 0; - Integer maxProcessLevel = 0; - Boolean isWorkCompleted = false; - Integer progressPercent = 0; - OkrTask okrTask = null; - OkrTaskHandled okrTaskHandled = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - List ids = null; - List log_ids = null; - List taskIds = null; - List taskList = new ArrayList(); - List taskHandledList = new ArrayList<>(); - List current_okrWorkReportPersonLinkList = null; - List next_okrWorkReportPersonLinkList = null; - - String processorName = okrUserManagerService.getPersonNameByIdentity( userIdentity ); - - isWorkCompleted = okrWorkReportBaseInfo.getIsWorkCompleted(); - progressPercent = okrWorkReportBaseInfo.getProgressPercent(); - if( isWorkCompleted ) { - progressPercent = 100; - } - if( progressPercent == 100 ) { - isWorkCompleted = true; - } - okrWorkReportBaseInfo.setIsWorkCompleted( isWorkCompleted ); - okrWorkReportBaseInfo.setProgressPercent( progressPercent ); - - if( processorName != null ){ - //二、处理本层级的处理人处理信息以及待办信息删除，新增已办信息 - //获取汇报信息当前的处理级别 - processLevel = okrWorkReportBaseInfo.getCurrentProcessLevel(); - - //查询本处理层级的处理人信息，更新处理状态为已处理 - ids = okrWorkReportPersonLinkService.getProcessPersonLinkInfoByReportAndLevel( okrWorkReportBaseInfo.getId(), processLevel, userIdentity, "处理中", "正常" ); - - //查询该次处理的待办信息 - taskIds = okrTaskService.listIdsByTargetActivityAndObjId( "工作汇报", okrWorkReportBaseInfo.getId(), okrWorkReportBaseInfo.getActivityName(), userIdentity ); - - //获取该汇报的最大审批等级 - maxProcessLevel = okrWorkReportPersonLinkService.getMaxProcessLevel( okrWorkReportBaseInfo.getId() ); - if( maxProcessLevel == null || maxProcessLevel <= 0 ){ - throw new Exception( "okrWorkReportBaseInfo{'id':'"+okrWorkReportBaseInfo.getId()+"'} can not find any processor in person link." ); - } - //查询正在处理中的草稿状态的日志，更新日志中的审批意见 - //记录本次的处理意见,先根据汇报ID，环节，处理人，信息状态来查询是否有处理日志 - log_ids = okrWorkReportProcessLogService.listByReportIdAndProcessor( okrWorkReportBaseInfo.getId(), okrWorkReportBaseInfo.getActivityName(), userIdentity, "草稿" ); - - //一、记录处理意见和处理日志 - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - - //将当前汇报,当前环节,当前人的待办清除,并且添加已办 - if( taskIds != null && !taskIds.isEmpty() ){ - for( String id : taskIds ){ - okrTask = emc.find( id, OkrTask.class ); - if( okrTask != null ){ - taskArriveDate = okrTask.getArriveDateTime(); - taskArriveDateString = okrTask.getArriveDateTimeStr(); - - //生成已办信息 - okrTaskHandled = new OkrTaskHandled(); - okrTaskHandled.setActivityName( okrTask.getActivityName() ); - okrTaskHandled.setArriveDateTime( okrTask.getArriveDateTime() ); - okrTaskHandled.setArriveDateTimeStr( okrTask.getArriveDateTimeStr() ); - okrTaskHandled.setCenterId( okrTask.getCenterId() ); - okrTaskHandled.setCenterTitle( okrTask.getCenterTitle() ); - okrTaskHandled.setDynamicObjectId( okrTask.getDynamicObjectId() ); - okrTaskHandled.setDynamicObjectTitle( okrTask.getDynamicObjectTitle() ); - okrTaskHandled.setDynamicObjectType( okrTask.getDynamicObjectType() ); - okrTaskHandled.setProcessDateTime( new Date() ); - okrTaskHandled.setProcessDateTimeStr( dateOperation.getNowDateTime() ); - //okrTaskHandled.setDuration(duration); - okrTaskHandled.setTargetTopUnitName( okrTask.getTargetTopUnitName() ); - okrTaskHandled.setTargetIdentity( okrTask.getTargetIdentity() ); - okrTaskHandled.setTargetName( okrTask.getTargetName() ); - okrTaskHandled.setTargetUnitName( okrTask.getTargetUnitName() ); - okrTaskHandled.setTitle( okrTask.getTitle() ); - okrTaskHandled.setViewUrl( "" ); - okrTaskHandled.setWorkId( okrTask.getWorkId() ); - okrTaskHandled.setWorkTitle( okrTask.getWorkTitle() ); - okrTaskHandled.setWorkType( okrTask.getWorkType() ); - taskHandledList.add( okrTaskHandled ); - //保存已办 - emc.persist( okrTaskHandled, CheckPersistType.all ); - //删除待办 - emc.remove( okrTask, CheckRemoveType.all ); - taskList.add( okrTask ); - } - } - } - if( taskArriveDate == null ){ - taskArriveDate = new Date(); - taskArriveDateString = dateOperation.getNowDateTime(); - } - //保存处理日志 - if( log_ids != null && log_ids.size() > 0 ){ - for( String id : log_ids ){ - okrWorkReportProcessLog = emc.find( id, OkrWorkReportProcessLog.class ); - if( okrWorkReportProcessLog != null ){ - okrWorkReportProcessLog.setOpinion(opinion); - okrWorkReportProcessLog.setProcessStatus( "已生效" ); - emc.check( okrWorkReportProcessLog, CheckPersistType.all ); - } - } - }else{ - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - okrWorkReportProcessLog.setActivityName( okrWorkReportBaseInfo.getActivityName() ); - okrWorkReportProcessLog.setArriveTime( taskArriveDate ); - okrWorkReportProcessLog.setArriveTimeStr( taskArriveDateString ); - okrWorkReportProcessLog.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrWorkReportProcessLog.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportProcessLog.setDecision( "提交" ); - okrWorkReportProcessLog.setOpinion( opinion ); - okrWorkReportProcessLog.setProcessLevel( 0 ); - okrWorkReportProcessLog.setProcessTime( new Date() ); - okrWorkReportProcessLog.setProcessTimeStr( dateOperation.getNowDateTime() ); - okrWorkReportProcessLog.setReportTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setStayTime( 0L ); - okrWorkReportProcessLog.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportProcessLog.setProcessStatus( "已生效" ); - okrWorkReportProcessLog.setWorkReportId( okrWorkReportBaseInfo.getId() ); - okrWorkReportProcessLog.setProcessorName( processorName ); - okrWorkReportProcessLog.setProcessorUnitName( okrUserManagerService.getUnitNameByIdentity(userIdentity) ); - okrWorkReportProcessLog.setProcessorIdentity( userIdentity ); - okrWorkReportProcessLog.setProcessorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(userIdentity) ); - - emc.persist( okrWorkReportProcessLog, CheckPersistType.all ); - } - - if( ids != null && !ids.isEmpty() ){ - current_okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list( ids ); - if( current_okrWorkReportPersonLinkList != null && !current_okrWorkReportPersonLinkList.isEmpty() ){ - for( OkrWorkReportPersonLink okrWorkReportPersonLink : current_okrWorkReportPersonLinkList ){ - //更新处理状态为处理中 - okrWorkReportPersonLink.setProcessStatus( "已处理" ); - emc.check(okrWorkReportPersonLink, CheckPersistType.all ); - } - } - } - - emc.commit(); - } catch ( Exception e ) { - throw e; - } - - //计算当前处理人 - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - - // 三、查询本层是否还有用户未处理，如果没有就准备发送下一个级别的待办 - ids = business.okrWorkReportPersonLinkFactory().getProcessPersonLinkInfoByReportAndLevel( okrWorkReportBaseInfo.getId(), processLevel, null, "处理中", "正常" ); - - okrWorkReportBaseInfo = emc.find(okrWorkReportBaseInfo.getId(), OkrWorkReportBaseInfo.class); - - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - - if ( ids == null || ids.isEmpty() ) { - // 该环节已经没有处理人了，准备处理下一层级 - // 根据当前环节查询汇报的下一批处理人，可能是一个，也可能是多个 - // 根据汇报当前的处理级别来计算下一个级别代号 - // 下一个处理级别是 prcessLevel+1 - processLevel++; - // 查询下一个层级的所有处理人 - do { - // 根据汇报ID和需要的处理级别查询所有的处理人信息 - ids = business.okrWorkReportPersonLinkFactory().getProcessPersonLinkInfoByReportAndLevel( okrWorkReportBaseInfo.getId(), processLevel, null, "待处理", "正常" ); - if (ids != null && !ids.isEmpty()) { - break; - } else { - processLevel++; - } - } while ( processLevel < maxProcessLevel || ( ids != null && !ids.isEmpty()) ); - - okrWorkReportBaseInfo.setCurrentProcessLevel(processLevel); - // 根据ID列表获取所有的处理人信息，更新处理状态为处理中 - next_okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list(ids); - - if ( next_okrWorkReportPersonLinkList != null && !next_okrWorkReportPersonLinkList.isEmpty() ) { - for ( OkrWorkReportPersonLink okrWorkReportPersonLink : next_okrWorkReportPersonLinkList ) { - // 更新处理状态为处理中 - okrWorkReportPersonLink.setProcessStatus( "处理中" ); - // 发送待办信息 - okrTask = new OkrTask(); - okrTask.setTitle(okrWorkReportBaseInfo.getTitle()); - okrTask.setCenterId(okrWorkReportBaseInfo.getCenterId()); - okrTask.setCenterTitle(okrWorkReportBaseInfo.getCenterTitle()); - okrTask.setWorkId(okrWorkReportBaseInfo.getWorkId()); - okrTask.setWorkTitle(okrWorkReportBaseInfo.getWorkTitle()); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType() ); - okrTask.setTargetIdentity(okrWorkReportPersonLink.getProcessorIdentity()); - okrTask.setTargetName(okrWorkReportPersonLink.getProcessorName()); - okrTask.setTargetUnitName(okrWorkReportPersonLink.getProcessorUnitName()); - okrTask.setTargetTopUnitName(okrWorkReportPersonLink.getProcessorTopUnitName()); - okrTask.setActivityName(okrWorkReportPersonLink.getActivityName()); - okrTask.setArriveDateTime(new Date()); - okrTask.setArriveDateTimeStr(dateOperation.getNowDateTime()); - okrTask.setDynamicObjectId(okrWorkReportBaseInfo.getId()); - okrTask.setDynamicObjectTitle(okrWorkReportBaseInfo.getTitle()); - okrTask.setDynamicObjectType( "工作汇报" ); - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist(okrTask, CheckPersistType.all); - taskList.add( okrTask ); - } - } else { - // 没有查询到需要处理的下级处理人，那么汇报已经审阅完成 - okrWorkReportBaseInfo.setActivityName( "已完成" ); - okrWorkReportBaseInfo.setCurrentProcessorTopUnitNameList(new ArrayList<>()); - okrWorkReportBaseInfo.setCurrentProcessorIdentityList(new ArrayList<>()); - okrWorkReportBaseInfo.setCurrentProcessorNameList(new ArrayList<>()); - okrWorkReportBaseInfo.setCurrentProcessorUnitNameList(new ArrayList<>()); - } - } else { - // logger.debug( "本等级还有其他人员未完成处理，不需要处理下一审批层级的信息。 ids.size=" + ids.size() ); - // 需要把汇报的当前处理人重新组织 - okrWorkReportBaseInfo.setCurrentProcessorTopUnitNameList(new ArrayList<>()); - okrWorkReportBaseInfo.setCurrentProcessorIdentityList(new ArrayList<>()); - okrWorkReportBaseInfo.setCurrentProcessorNameList(new ArrayList<>()); - okrWorkReportBaseInfo.setCurrentProcessorUnitNameList(new ArrayList<>()); - next_okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().list(ids); - - if (next_okrWorkReportPersonLinkList != null && !next_okrWorkReportPersonLinkList.isEmpty()) { - for (OkrWorkReportPersonLink okrWorkReportPersonLink : next_okrWorkReportPersonLinkList) { - okrWorkReportBaseInfo.getCurrentProcessorNameList().add( okrWorkReportPersonLink.getProcessorName() ); - okrWorkReportBaseInfo.getCurrentProcessorIdentityList().add( okrWorkReportPersonLink.getProcessorIdentity() ); - okrWorkReportBaseInfo.getCurrentProcessorUnitNameList().add( okrWorkReportPersonLink.getProcessorUnitName() ); - okrWorkReportBaseInfo.getCurrentProcessorTopUnitNameList().add( okrWorkReportPersonLink.getProcessorTopUnitName() ); - } - } - } - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - emc.commit(); - } catch ( Exception e ) { - throw e; - } - }else{ - throw new Exception( "处理者不存在，身份：" + userIdentity); - } - - if( taskList != null && taskList.size() > 0 ){ - for( OkrTask task : taskList ){ - List workTypeList = new ArrayList(); - workTypeList.add( task.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( task.getTargetIdentity(), workTypeList ); - } - for( OkrTaskHandled taskHandled : taskHandledList ){ - List workTypeList = new ArrayList(); - workTypeList.add( taskHandled.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( taskHandled.getTargetIdentity(), workTypeList ); - } - } - - return okrWorkReportBaseInfo; - } - - /** - * 根据传入的参数来保存工作汇报信息记录 - * 一般来说，汇报的审核人就是工作的部署者，部分顶层组织需要根据要求增加环节： - * 模式一： 拟稿 - 顶层组织工作管理员 - 工作部署者 - * 模式二： 拟稿 - 工作部署者 - * 将需要处理的人员记录到OkrWorkReportPersonLink，处理审核时，按这个LINK来 - * - * 提交后处理方式: - * 提交后会按配置[REPORT_AUTHOR_NOTICE]要求向工作授权者发送待办或者待阅信息 - * - * @param wrapIn - * @param okrWorkBaseInfo - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo submitReportInfo( OkrWorkReportBaseInfo wrapInOkrWorkReportBaseInfo, OkrCenterWorkInfo okrCenterWorkInfo, OkrWorkBaseInfo okrWorkBaseInfo, - String workPointAndRequirements, - String progressDescription, String workPlan, String adminSuperviseInfo, String memo, String opinion ) throws Exception { - if( wrapInOkrWorkReportBaseInfo == null ){ - throw new Exception( "传入的工作汇报信息为空，无法继续提交汇报信息" ); - } - if( okrWorkBaseInfo == null ){ - throw new Exception( "传入的工作基础信息okrWorkBaseInfo为空，无法继续提交汇报信息" ); - } - if( okrCenterWorkInfo == null ){ - throw new Exception( "传入的中心工作信息okrCenterWorkInfo为空，无法继续提交汇报信息" ); - } - String workAdminIdentity = null; //通过系统配置来判断汇报是否需要工作管理员来补充信息或者审核 - /** - * 汇报流程方式 - * reportWorkflowType = ADMIN_AND_ALLLEADER - 经过工作管理员和所有的批示领导 - * reportWorkflowType = DEPLOYER - 工作部署者审核（默认） - */ - String reportWorkflowType = null; - /** - * report_author_notice = "NONE" 或者空，不通知授权者 - * report_author_notice = "READ" 待阅通知 - * report_author_notice = "TASK" 待办通知 - */ - String report_author_notice = null; - String personName = null; - Boolean isWorkCompleted = false; - Integer progressPercent = 0; - List oldOkrTaskIds = null; - List okrWorkReportPersonLinkList = new ArrayList(); - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo_tmp = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - OkrWorkAuthorizeRecord okrWorkAuthorizeRecord = null; - List taskList = new ArrayList(); //需要发送待办的待办人信息 - List oldOkrTaskList = null; - OkrTask oldOkrTask = null; - OkrTaskHandled okrTaskHandled = null; - Integer processLevel = 0; - String report_audit_control_level_str = null; - Integer report_audit_control_level = 0; - - isWorkCompleted = wrapInOkrWorkReportBaseInfo.getIsWorkCompleted(); - progressPercent = wrapInOkrWorkReportBaseInfo.getProgressPercent(); - if( isWorkCompleted ) { - progressPercent = 100; - } - if( progressPercent == 100 ) { - isWorkCompleted = true; - } - wrapInOkrWorkReportBaseInfo.setIsWorkCompleted( isWorkCompleted ); - wrapInOkrWorkReportBaseInfo.setProgressPercent( progressPercent ); - - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - okrWorkReportPersonLink.setActivityName( "草稿" ); - okrWorkReportPersonLink.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrWorkReportPersonLink.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportPersonLink.setProcessLevel( processLevel ); - okrWorkReportPersonLink.setProcessorIdentity( wrapInOkrWorkReportBaseInfo.getReporterIdentity() ); - okrWorkReportPersonLink.setProcessorName( wrapInOkrWorkReportBaseInfo.getReporterName() ); - okrWorkReportPersonLink.setProcessorUnitName( wrapInOkrWorkReportBaseInfo.getReporterUnitName() ); - okrWorkReportPersonLink.setProcessorTopUnitName( wrapInOkrWorkReportBaseInfo.getReporterTopUnitName() ); - okrWorkReportPersonLink.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportPersonLink.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrWorkReportPersonLink.setWorkReportId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportPersonLink.setProcessStatus( "已处理" ); - okrWorkReportPersonLinkList.add( okrWorkReportPersonLink ); - - //查询原有待办信息 - oldOkrTaskIds = okrTaskService.listIdsByTargetActivityAndObjId( - "工作汇报", //工作汇报拟稿 - wrapInOkrWorkReportBaseInfo.getId(), - "拟稿", - wrapInOkrWorkReportBaseInfo.getReporterIdentity() - ); - - if( oldOkrTaskIds != null && !oldOkrTaskIds.isEmpty() ){ - oldOkrTaskList = okrTaskService.list( oldOkrTaskIds ); - if( oldOkrTaskList != null && !oldOkrTaskList.isEmpty() ){ - oldOkrTask = oldOkrTaskList.get( 0 ); - } - } - //新增已办 - okrTaskHandled = new OkrTaskHandled(); - if( oldOkrTask != null ){ - okrTaskHandled.setTitle( oldOkrTask.getTitle() ); - okrTaskHandled.setActivityName( oldOkrTask.getActivityName() ); - okrTaskHandled.setCenterId( oldOkrTask.getCenterId() ); - okrTaskHandled.setCenterTitle( oldOkrTask.getCenterTitle() ); - okrTaskHandled.setWorkId( oldOkrTask.getWorkId() ); - okrTaskHandled.setWorkTitle( oldOkrTask.getWorkTitle() ); - okrTaskHandled.setWorkType( oldOkrTask.getWorkType() ); - okrTaskHandled.setDynamicObjectId( oldOkrTask.getId() ); - okrTaskHandled.setDynamicObjectTitle( oldOkrTask.getTitle() ); - okrTaskHandled.setDynamicObjectType( oldOkrTask.getDynamicObjectType() ); - okrTaskHandled.setArriveDateTime( oldOkrTask.getArriveDateTime() ); - okrTaskHandled.setArriveDateTimeStr( oldOkrTask.getArriveDateTimeStr() ); - }else{ - okrTaskHandled.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrTaskHandled.setActivityName( "拟稿" ); - okrTaskHandled.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrTaskHandled.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrTaskHandled.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrTaskHandled.setWorkTitle( wrapInOkrWorkReportBaseInfo.getWorkTitle() ); - okrTaskHandled.setWorkType( wrapInOkrWorkReportBaseInfo.getWorkType() ); - okrTaskHandled.setDynamicObjectId( wrapInOkrWorkReportBaseInfo.getId() ); - okrTaskHandled.setDynamicObjectTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrTaskHandled.setDynamicObjectType( "工作汇报" );//工作汇报拟稿 - okrTaskHandled.setArriveDateTime( null ); - okrTaskHandled.setArriveDateTimeStr( null ); - } - okrTaskHandled.setTargetTopUnitName( wrapInOkrWorkReportBaseInfo.getReporterTopUnitName() ); - okrTaskHandled.setTargetIdentity( wrapInOkrWorkReportBaseInfo.getReporterIdentity() ); - okrTaskHandled.setTargetName( wrapInOkrWorkReportBaseInfo.getReporterName() ); - okrTaskHandled.setTargetUnitName( wrapInOkrWorkReportBaseInfo.getReporterUnitName() ); - okrTaskHandled.setProcessDateTime( new Date() ); - okrTaskHandled.setProcessDateTimeStr( dateOperation.getNowDateTime() ); - //okrTaskHandled.setDuration(duration); - okrTaskHandled.setViewUrl( "" ); - - //获取系统配置 - 汇报工作流方式（两种选择） - try { - reportWorkflowType = okrConfigSystemService.getValueWithConfigCode( "REPORT_WORKFLOW_TYPE" ); - wrapInOkrWorkReportBaseInfo.setReportWorkflowType( reportWorkflowType ); - } catch (Exception e) { - logger.warn( "system get system config 'REPORT_WORKFLOW_TYPE' got an exception" ); - throw e; - } - - //从系统设置中查询全局工作管理员身份 - try { - workAdminIdentity = okrConfigSystemService.getValueWithConfigCode( "REPORT_SUPERVISOR" ); - } catch (Exception e) { - logger.warn( "system get system config 'REPORT_SUPERVISOR' got an exception" ); - throw e; - } - - //从系统设置中查询汇报审阅控制层级数 - try { - report_audit_control_level_str = okrConfigSystemService.getValueWithConfigCode( "REPORT_AUDIT_LEVEL" ); - report_audit_control_level = Integer.parseInt( report_audit_control_level_str ); - } catch (Exception e) { - logger.warn( "system get system config 'REPORT_AUDIT_LEVEL' got an exception" ); - report_audit_control_level = 0; - } - - //从系统设置中查询是否需要给工作委托人发送待办或者待阅（NONE|TASK|READ） - try { - report_author_notice = okrConfigSystemService.getValueWithConfigCode("REPORT_AUTHOR_NOTICE"); - } catch (Exception e) { - logger.warn("system get system config 'REPORT_AUTHOR_NOTICE' got an exception" ); - logger.error(e); - report_audit_control_level = 0; - } - - //首先判断该工作是否有授权，授权者是谁 - try { - okrWorkAuthorizeRecord = getLastAuthorizeRecord( wrapInOkrWorkReportBaseInfo.getWorkId() ); - } catch (Exception e) { - logger.warn("system get okrWorkAuthorizeRecord with work id got an exception" ); - logger.error(e); - } - - if( okrWorkAuthorizeRecord != null ){ - //如果需要给委托者发待阅，那么直接给委托者发待阅 - //如果需要给委托者发待办，那么增加给委托者发待办的记录 - if( "TASK".equalsIgnoreCase( report_author_notice ) ){ - //增加处理链 - processLevel++; - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - okrWorkReportPersonLink.setActivityName( "授权者审核" ); - okrWorkReportPersonLink.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrWorkReportPersonLink.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportPersonLink.setProcessLevel( processLevel ); - okrWorkReportPersonLink.setProcessorIdentity( okrWorkAuthorizeRecord.getDelegatorIdentity() ); - okrWorkReportPersonLink.setProcessorName( okrWorkAuthorizeRecord.getDelegatorName() ); - okrWorkReportPersonLink.setProcessorUnitName( okrWorkAuthorizeRecord.getDelegatorUnitName() ); - okrWorkReportPersonLink.setProcessorTopUnitName( okrWorkAuthorizeRecord.getDelegatorTopUnitName() ); - okrWorkReportPersonLink.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportPersonLink.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrWorkReportPersonLink.setWorkReportId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportPersonLink.setProcessStatus( "待处理" ); - okrWorkReportPersonLinkList.add( okrWorkReportPersonLink ); - }else if( "READ".equalsIgnoreCase( report_author_notice ) ){ - //直接发待阅消息 - addReportAuditReader( wrapInOkrWorkReportBaseInfo, okrWorkAuthorizeRecord.getDelegatorIdentity(), okrWorkAuthorizeRecord.getDelegatorName(), - okrWorkAuthorizeRecord.getDelegatorUnitName(), okrWorkAuthorizeRecord.getDelegatorTopUnitName() ); - } - } - - if( okrWorkBaseInfo.getWorkAuditLevel() <= report_audit_control_level ){ - /** - * 确定汇报工作流 - * - * 1、先确定工作汇报工作流执行方式：1）工作管理员督办 - 中心工作阅知领导审阅； 2）工作部署者审阅 - * 2、如果是方式1） - a.判断系统设置中是否有设置工作管理员 - b.如果有设置工作管理员，那么下一步处理者为工作管理员，如果没有设置工作管理员，那么判断中心工作是否有设置阅知领导 - c.如果中心工作没有设置阅知领导，那么下一步处理者为工作部署者审阅，并且在汇报的descript中说明原因 - * 3、汇报工作流执行方式生效工作层级 - */ - //判断汇报工作流方式 - if( "ADMIN_AND_ALLLEADER".equalsIgnoreCase( wrapInOkrWorkReportBaseInfo.getReportWorkflowType() ) ){ - wrapInOkrWorkReportBaseInfo.setReportWorkflowType( "ADMIN_AND_ALLLEADER" ); - //判断系统设置中是否有设置工作管理员 - if( StringUtils.isNotEmpty( workAdminIdentity )){ - personName = okrUserManagerService.getPersonNameByIdentity( workAdminIdentity ); - wrapInOkrWorkReportBaseInfo.setWorkAdminIdentity( workAdminIdentity ); - wrapInOkrWorkReportBaseInfo.setWorkAdminName( personName ); - wrapInOkrWorkReportBaseInfo.setNeedAdminAudit( true ); - }else{//系统未设置全局的工作管理员 - wrapInOkrWorkReportBaseInfo.setDescription( "系统设置中未配置全局工作管理员，尝试将汇报提交给中心工作阅知领导。" ); - } - //继续判断工作所属的中心工作中是否设置了汇报审阅领导 - if( ListTools.isNotEmpty( okrCenterWorkInfo.getReportAuditLeaderIdentityList() ) ){//中心工作已经配置了阅知领导 - wrapInOkrWorkReportBaseInfo.setReadLeadersNameList(okrCenterWorkInfo.getReportAuditLeaderNameList()); - wrapInOkrWorkReportBaseInfo.setReadLeadersIdentityList( okrCenterWorkInfo.getReportAuditLeaderIdentityList() ); - wrapInOkrWorkReportBaseInfo.setNeedLeaderRead( true ); - }else{ - wrapInOkrWorkReportBaseInfo.setDescription( "工作汇报所在的中心工作未设置汇报阅知领导。" ); - } - //如果管理员和汇报领导都没有设置，那么将方式设置为DEPLOYER - if( StringUtils.isEmpty(workAdminIdentity) && ListTools.isNotEmpty( okrCenterWorkInfo.getReportAuditLeaderIdentityList() )){ - wrapInOkrWorkReportBaseInfo.setNeedLeaderRead( false ); - wrapInOkrWorkReportBaseInfo.setNeedAdminAudit( false ); - wrapInOkrWorkReportBaseInfo.setReportWorkflowType( "DEPLOYER" ); - wrapInOkrWorkReportBaseInfo.setDescription( "中心工作未设置全局工作管理员和阅知领导，将汇报工作流方式修改为部署者阅知(DEPLOYER)。" ); - } - } - - if( "DEPLOYER".equalsIgnoreCase( wrapInOkrWorkReportBaseInfo.getReportWorkflowType() ) ){ - wrapInOkrWorkReportBaseInfo.setNeedAdminAudit( false ); - wrapInOkrWorkReportBaseInfo.setNeedLeaderRead( false ); - } - }else{//不属于汇报控制级别内的直接汇报给工作部署者 - wrapInOkrWorkReportBaseInfo.setReportWorkflowType( "DEPLOYER" ); - wrapInOkrWorkReportBaseInfo.setNeedAdminAudit( false ); - wrapInOkrWorkReportBaseInfo.setNeedLeaderRead( false ); - wrapInOkrWorkReportBaseInfo.setDescription( "汇报审核层级控制未控制到本级工作。" ); - } - - /** - * 根据系统设置以及中心工作设置来记录工作汇报的处理过程 - */ - wrapInOkrWorkReportBaseInfo.setCurrentProcessorNameList( new ArrayList<>() ); - wrapInOkrWorkReportBaseInfo.setCurrentProcessorIdentityList( new ArrayList<>() ); - wrapInOkrWorkReportBaseInfo.setCurrentProcessorUnitNameList( new ArrayList<>() ); - wrapInOkrWorkReportBaseInfo.setCurrentProcessorTopUnitNameList( new ArrayList<>() ); - - if( "ADMIN_AND_ALLLEADER".equalsIgnoreCase( wrapInOkrWorkReportBaseInfo.getReportWorkflowType() )){ - if( wrapInOkrWorkReportBaseInfo.getNeedAdminAudit() ){ - processLevel ++; - workAdminIdentity = wrapInOkrWorkReportBaseInfo.getWorkAdminIdentity(); - if( StringUtils.isNotEmpty(workAdminIdentity) ){ - personName = okrUserManagerService.getPersonNameByIdentity( workAdminIdentity ); - if( personName != null ){ - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - if( ListTools.isEmpty( wrapInOkrWorkReportBaseInfo.getCurrentProcessorIdentityList() ) ){ - wrapInOkrWorkReportBaseInfo.setProcessStatus( "管理员督办" ); - wrapInOkrWorkReportBaseInfo.setActivityName( "管理员督办" ); - wrapInOkrWorkReportBaseInfo.setProcessType( "审批" ); - wrapInOkrWorkReportBaseInfo.setCurrentProcessLevel(processLevel); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorNameList().add( personName ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorIdentityList().add( workAdminIdentity ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorUnitNameList().add( okrUserManagerService.getUnitNameByIdentity( workAdminIdentity ) ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorTopUnitNameList().add( okrUserManagerService.getTopUnitNameByIdentity( workAdminIdentity ) ); - okrWorkReportPersonLink.setProcessStatus( "处理中" ); - taskList = addNewTask( wrapInOkrWorkReportBaseInfo, taskList ); - }else{ - okrWorkReportPersonLink.setProcessStatus( "待处理" ); - } - okrWorkReportPersonLink.setActivityName( "管理员督办" ); - okrWorkReportPersonLink.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrWorkReportPersonLink.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportPersonLink.setProcessLevel( processLevel ); - okrWorkReportPersonLink.setProcessorIdentity( workAdminIdentity ); - okrWorkReportPersonLink.setProcessorName( personName ); - okrWorkReportPersonLink.setProcessorUnitName( okrUserManagerService.getUnitNameByIdentity( workAdminIdentity ) ); - okrWorkReportPersonLink.setProcessorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( workAdminIdentity ) ); - okrWorkReportPersonLink.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportPersonLink.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrWorkReportPersonLink.setWorkReportId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportPersonLinkList.add( okrWorkReportPersonLink ); - } - } - } - - boolean hasAdminProcessor = false; - if( ListTools.isNotEmpty( wrapInOkrWorkReportBaseInfo.getCurrentProcessorIdentityList() )){ - hasAdminProcessor = true; - } - - //为审阅领导添加okrWorkReportPersonLink - if( wrapInOkrWorkReportBaseInfo.getNeedLeaderRead() ){ - if( ListTools.isNotEmpty( okrCenterWorkInfo.getReportAuditLeaderIdentityList() ) ){ - processLevel ++; - for( String identity : okrCenterWorkInfo.getReportAuditLeaderIdentityList() ){ - personName = okrUserManagerService.getPersonNameByIdentity( identity ); - if( personName != null ){ - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - if( !hasAdminProcessor ){ - wrapInOkrWorkReportBaseInfo.setProcessStatus( "领导批示" ); - wrapInOkrWorkReportBaseInfo.setActivityName( "领导批示" ); - wrapInOkrWorkReportBaseInfo.setProcessType( "审阅" ); - wrapInOkrWorkReportBaseInfo.setCurrentProcessLevel(processLevel); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorNameList().add( personName ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorIdentityList().add( identity ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorUnitNameList().add( okrUserManagerService.getUnitNameByIdentity( identity ) ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorTopUnitNameList().add( okrUserManagerService.getTopUnitNameByIdentity( identity ) ); - okrWorkReportPersonLink.setProcessStatus( "处理中" ); - taskList = addNewTask( wrapInOkrWorkReportBaseInfo, taskList ); - } else{ - okrWorkReportPersonLink.setProcessStatus( "待处理" ); - } - okrWorkReportPersonLink.setActivityName( "领导批示" ); - okrWorkReportPersonLink.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrWorkReportPersonLink.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportPersonLink.setProcessLevel( processLevel ); - okrWorkReportPersonLink.setProcessorIdentity( identity ); - okrWorkReportPersonLink.setProcessorName( personName ); - okrWorkReportPersonLink.setProcessorUnitName( okrUserManagerService.getUnitNameByIdentity( identity ) ); - okrWorkReportPersonLink.setProcessorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( identity ) ); - okrWorkReportPersonLink.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportPersonLink.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrWorkReportPersonLink.setWorkReportId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportPersonLink.setProcessStatus( "待处理" ); - okrWorkReportPersonLinkList.add( okrWorkReportPersonLink ); - } - } - } - } - }else{ - //直接汇报给工作部署者 - wrapInOkrWorkReportBaseInfo.setProcessStatus( "领导批示" ); - wrapInOkrWorkReportBaseInfo.setActivityName( "领导批示" ); - wrapInOkrWorkReportBaseInfo.setProcessType( "审阅" ); - wrapInOkrWorkReportBaseInfo.setCurrentProcessLevel(processLevel); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorNameList().add( okrWorkBaseInfo.getDeployerName() ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorIdentityList().add( okrWorkBaseInfo.getDeployerIdentity() ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorUnitNameList().add( okrWorkBaseInfo.getDeployerUnitName() ); - wrapInOkrWorkReportBaseInfo.getCurrentProcessorTopUnitNameList().add( okrWorkBaseInfo.getDeployerTopUnitName() ); - taskList = addNewTask( wrapInOkrWorkReportBaseInfo, taskList ); - - processLevel ++; - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - okrWorkReportPersonLink.setActivityName( "领导批示" ); - okrWorkReportPersonLink.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrWorkReportPersonLink.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportPersonLink.setProcessLevel( processLevel ); - okrWorkReportPersonLink.setProcessorIdentity( okrWorkBaseInfo.getDeployerIdentity() ); - okrWorkReportPersonLink.setProcessorName( okrWorkBaseInfo.getDeployerName() ); - okrWorkReportPersonLink.setProcessorUnitName( okrWorkBaseInfo.getDeployerUnitName() ); - okrWorkReportPersonLink.setProcessorTopUnitName( okrWorkBaseInfo.getDeployerTopUnitName() ); - okrWorkReportPersonLink.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportPersonLink.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrWorkReportPersonLink.setWorkReportId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportPersonLinkList.add( okrWorkReportPersonLink ); - } - - //创建汇报处理日志 - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - okrWorkReportProcessLog.setActivityName( "拟稿" ); - okrWorkReportProcessLog.setArriveTime( new Date() ); - okrWorkReportProcessLog.setArriveTimeStr( dateOperation.getNowDateTime()); - okrWorkReportProcessLog.setCenterId( wrapInOkrWorkReportBaseInfo.getCenterId() ); - okrWorkReportProcessLog.setCenterTitle( wrapInOkrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportProcessLog.setDecision( "提交" ); - okrWorkReportProcessLog.setOpinion( "请审批" ); - okrWorkReportProcessLog.setProcessLevel( 0 ); - okrWorkReportProcessLog.setProcessTime( new Date() ); - okrWorkReportProcessLog.setProcessTimeStr( dateOperation.getNowDateTime() ); - okrWorkReportProcessLog.setReportTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setStayTime( 0L ); - okrWorkReportProcessLog.setTitle( wrapInOkrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setWorkId( wrapInOkrWorkReportBaseInfo.getWorkId() ); - okrWorkReportProcessLog.setProcessStatus( "已生效" ); - okrWorkReportProcessLog.setWorkReportId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportProcessLog.setProcessorName( wrapInOkrWorkReportBaseInfo.getReporterName() ); - okrWorkReportProcessLog.setProcessorUnitName( wrapInOkrWorkReportBaseInfo.getReporterUnitName() ); - okrWorkReportProcessLog.setProcessorIdentity( wrapInOkrWorkReportBaseInfo.getReporterIdentity() ); - okrWorkReportProcessLog.setProcessorTopUnitName( wrapInOkrWorkReportBaseInfo.getReporterTopUnitName() ); - - //保存数据到数据库中 - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrTaskHandled.class ); - emc.beginTransaction( OkrTask.class ); - - //删除待办信息 - if( oldOkrTaskIds != null && !oldOkrTaskIds.isEmpty() ){ - for( String oldTaskId : oldOkrTaskIds ){ - oldOkrTask = emc.find( oldTaskId, OkrTask.class ); - emc.remove( oldOkrTask, CheckRemoveType.all ); - } - } - - //保存汇报处理记录 - emc.persist( okrWorkReportProcessLog, CheckPersistType.all); - - //保存已办 - emc.persist( okrTaskHandled, CheckPersistType.all ); - - //保存所有的处理人信息（汇报处理链） - if( okrWorkReportPersonLinkList != null && okrWorkReportPersonLinkList.size() > 0 ){ - for( OkrWorkReportPersonLink _okrWorkReportPersonLink : okrWorkReportPersonLinkList ){ - emc.persist( _okrWorkReportPersonLink, CheckPersistType.all); - } - } - - //向下一步处理者发送待办 - if( taskList != null && taskList.size() > 0 ){ - for( OkrTask task : taskList ){ - //logger.debug( "准备保存一条待办信息：target:" + task.getTargetIdentity() + ", title=" + task.getTitle() ); - emc.persist( task, CheckPersistType.all ); - } - } - //保存汇报基础信息 - //logger.debug( "get report base info : wrapIn.getId()="+ wrapIn.getId() ); - okrWorkReportBaseInfo_tmp = emc.find( wrapInOkrWorkReportBaseInfo.getId(), OkrWorkReportBaseInfo.class ); - //logger.debug( "wrapIn.getNeedAdminAudit() = " + wrapIn.getNeedAdminAudit() ); - if( okrWorkReportBaseInfo_tmp == null ){ - okrWorkReportBaseInfo = new OkrWorkReportBaseInfo(); - wrapInOkrWorkReportBaseInfo.copyTo( okrWorkReportBaseInfo ); - if( okrWorkReportBaseInfo.getCreateTime() == null ) { - okrWorkReportBaseInfo.setCreateTime( new Date() ); - } - if( okrWorkReportBaseInfo.getUpdateTime() == null ) { - okrWorkReportBaseInfo.setUpdateTime( okrWorkReportBaseInfo.getCreateTime() ); - } - okrWorkReportBaseInfo.setId( wrapInOkrWorkReportBaseInfo.getId() ); - //logger.debug( "okrWorkReportBaseInfo.getNeedAdminAudit() = " + okrWorkReportBaseInfo.getNeedAdminAudit() ); - emc.persist( okrWorkReportBaseInfo, CheckPersistType.all);//保存汇报基础信息 - }else{ - List attachments = okrWorkReportBaseInfo_tmp.getAttachmentList(); - wrapInOkrWorkReportBaseInfo.copyTo( okrWorkReportBaseInfo_tmp, JpaObject.FieldsUnmodify ); - okrWorkReportBaseInfo_tmp.setAttachmentList( attachments ); - - if( okrWorkReportBaseInfo_tmp.getCreateTime() == null ) { - okrWorkReportBaseInfo_tmp.setCreateTime( new Date() ); - } - if( okrWorkReportBaseInfo_tmp.getUpdateTime() == null ) { - okrWorkReportBaseInfo_tmp.setUpdateTime( okrWorkReportBaseInfo_tmp.getCreateTime() ); - } - emc.check( okrWorkReportBaseInfo_tmp, CheckPersistType.all ); - //logger.debug( "okrWorkReportBaseInfo_tmp.getNeedAdminAudit() = " + okrWorkReportBaseInfo_tmp.getNeedAdminAudit() ); - okrWorkReportBaseInfo = okrWorkReportBaseInfo_tmp; - } - - okrWorkReportDetailInfo = emc.find( okrWorkReportBaseInfo.getId(), OkrWorkReportDetailInfo.class ); - //保存汇报详细信息 - //logger.debug( "get report detail info wrapIn.getId()="+ wrapIn.getId() ); - if( okrWorkReportDetailInfo != null ){ - okrWorkReportDetailInfo.setId( wrapInOkrWorkReportBaseInfo.getId() ); - okrWorkReportDetailInfo.setCenterId(okrWorkReportBaseInfo.getCenterId()); - okrWorkReportDetailInfo.setShortTitle( okrWorkReportBaseInfo.getShortTitle() ); - okrWorkReportDetailInfo.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportDetailInfo.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportDetailInfo.setStatus( "正常" ); - okrWorkReportDetailInfo.setWorkPlan( workPlan ); - okrWorkReportDetailInfo.setProgressDescription( progressDescription ); - okrWorkReportDetailInfo.setWorkPointAndRequirements( workPointAndRequirements ); - okrWorkReportDetailInfo.setMemo( memo ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - }else{ - okrWorkReportDetailInfo = new OkrWorkReportDetailInfo(); - okrWorkReportDetailInfo.setId( wrapInOkrWorkReportBaseInfo.getId() );//使用参数传入的ID作为记录的ID - okrWorkReportDetailInfo.setCenterId(okrWorkReportBaseInfo.getCenterId()); - okrWorkReportDetailInfo.setShortTitle( okrWorkReportBaseInfo.getShortTitle() ); - okrWorkReportDetailInfo.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportDetailInfo.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportDetailInfo.setStatus( "正常" ); - okrWorkReportDetailInfo.setWorkPlan( workPlan ); - okrWorkReportDetailInfo.setProgressDescription( progressDescription ); - okrWorkReportDetailInfo.setWorkPointAndRequirements( workPointAndRequirements ); - okrWorkReportDetailInfo.setMemo( memo ); - emc.persist( okrWorkReportDetailInfo, CheckPersistType.all ); - } - emc.commit(); - } catch ( Exception e ) { - throw e; - } - - if( taskList != null && taskList.size() > 0 ){ - for( OkrTask task : taskList ){ - List workTypeList = new ArrayList(); - workTypeList.add( task.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( task.getTargetIdentity(), workTypeList ); - } - } - - return okrWorkReportBaseInfo; - } - - private OkrWorkAuthorizeRecord getLastAuthorizeRecord( String workId ) throws Exception { - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkAuthorizeRecordFactory().getLastAuthorizeRecord( workId, null, "正常" ); - } catch ( Exception e ) { - throw e; - } - } - - private List addNewTask( OkrWorkReportBaseInfo okrWorkReportBaseInfo, List taskList ) throws Exception { - if( taskList == null ){ - taskList = new ArrayList(); - } - List identities = okrWorkReportBaseInfo.getCurrentProcessorIdentityList(); - List names = okrWorkReportBaseInfo.getCurrentProcessorNameList(); - List unitNames = okrWorkReportBaseInfo.getCurrentProcessorUnitNameList(); - List topUnitNames = okrWorkReportBaseInfo.getCurrentProcessorTopUnitNameList(); - - OkrTask okrTask = null; - if( ListTools.isNotEmpty( identities )) { - for( int i = 0; i< identities.size() ; i ++) { - okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrTask.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrTask.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrTask.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle() ); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType() ); - if( identities != null && identities.size() > i ) { - okrTask.setTargetIdentity( identities.get(i) ); - } - if( names != null && names.size() > i ) { - okrTask.setTargetName( names.get(i) ); - } - if( unitNames != null && unitNames.size() > i ) { - okrTask.setTargetUnitName( unitNames.get(i) ); - } - if( topUnitNames != null && topUnitNames.size() > i ) { - okrTask.setTargetTopUnitName( topUnitNames.get(i) ); - } - okrTask.setActivityName( okrWorkReportBaseInfo.getActivityName() ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getDateStringFromDate( new Date(), "yyyy-MM-dd HH:mm:ss" ) ); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId() ); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setDynamicObjectType( "工作汇报" ); - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - //logger.debug( "准备新增一条待办信息：target:" + okrTask.getTargetIdentity() + ", title=" + okrTask.getTitle() ); - taskList.add( okrTask ); - } - } - return taskList; - } - - /** - * 为汇报人添加一条汇报确认的待阅信息 - * @param okrWorkReportBaseInfo - * @param opinion - * @param loginIdentity - * @throws Exception - */ - public void addReportConfirmReader( OkrWorkReportBaseInfo okrWorkReportBaseInfo, String loginIdentity, String name, String unitName, String topUnitName ) throws Exception { - if( okrWorkReportBaseInfo == null ){ - throw new Exception( "okrWorkReportBaseInfo is null!" ); - } - if( loginIdentity == null ){ - throw new Exception( "loginIdentity is null!" ); - } - OkrTask okrTask = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - emc.beginTransaction( OkrTask.class ); - okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle()); - okrTask.setCenterId( okrWorkReportBaseInfo.getCenterId()); - okrTask.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle()); - okrTask.setWorkId( okrWorkReportBaseInfo.getWorkId()); - okrTask.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle()); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType()); - okrTask.setTargetIdentity( loginIdentity ); - okrTask.setTargetName( name ); - okrTask.setTargetUnitName( unitName ); - okrTask.setTargetTopUnitName( topUnitName ); - okrTask.setActivityName( "汇报确认" ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getNowDateTime()); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId()); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle()); - okrTask.setDynamicObjectType( "汇报确认" ); - okrTask.setProcessType( "READ" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - emc.commit(); - }catch ( Exception e ) { - throw e; - } - } - - /** - * 为汇报人添加一条汇报确认的待阅信息 - * @param okrWorkReportBaseInfo - * @param opinion - * @param loginIdentity - * @throws Exception - */ - public void addReportAuditReader( OkrWorkReportBaseInfo okrWorkReportBaseInfo, String loginIdentity, String name, String unitName, String topUnitName ) throws Exception { - if( okrWorkReportBaseInfo == null ){ - throw new Exception( "okrWorkReportBaseInfo is null!" ); - } - if( loginIdentity == null ){ - throw new Exception( "loginIdentity is null!" ); - } - OkrTask okrTask = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - emc.beginTransaction( OkrTask.class ); - okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle()); - okrTask.setCenterId( okrWorkReportBaseInfo.getCenterId()); - okrTask.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle()); - okrTask.setWorkId( okrWorkReportBaseInfo.getWorkId()); - okrTask.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle()); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType()); - okrTask.setTargetIdentity( loginIdentity ); - okrTask.setTargetName( name ); - okrTask.setTargetUnitName( unitName ); - okrTask.setTargetTopUnitName( topUnitName ); - okrTask.setActivityName( "领导批示" ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getNowDateTime()); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId()); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle()); - okrTask.setDynamicObjectType( "工作汇报" ); - okrTask.setProcessType( "READ" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - emc.commit(); - }catch ( Exception e ) { - throw e; - } - } - - /** - * 将汇报信息调度到结束 - * 1、汇报信息的信息状态修改为“结束”，详细信息里状态修改为“结束” - * 2、汇报信息的当前处理环节“结束” - * 3、汇报信息待办信息 - * 4、汇报信息待办汇总信息 - * 5、汇报信息处理记录里添加系统处理记录 - * 6、PERSONLINK记录里的处理状态修改为“结束” - * @param id - * @throws Exception - */ - public void dispatchToOver( String id ) throws Exception { - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - OkrTask okrTask = null; - List okrTaskList = new ArrayList<>(); - List ids = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrTask.class ); - - okrWorkReportBaseInfo = emc.find( id, OkrWorkReportBaseInfo.class ); - if ( null != okrWorkReportBaseInfo ) { - okrWorkReportBaseInfo.setActivityName( "结束" ); - okrWorkReportBaseInfo.setStatus( "结束" ); - okrWorkReportBaseInfo.setProcessStatus( "自动结束" ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - } - - ids = business.okrTaskFactory().listIdsByReportId( id ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrTask = emc.find( _id, OkrTask.class ); - if ( null != okrTask ) { - okrTaskList.add( okrTask ); - emc.remove( okrTask, CheckRemoveType.all ); - } - } - } - - //处理所有的汇报详情 - okrWorkReportDetailInfo = emc.find( id, OkrWorkReportDetailInfo.class ); - if ( null != okrWorkReportDetailInfo ) { - okrWorkReportDetailInfo.setStatus( "结束" ); - emc.check( okrWorkReportDetailInfo,CheckPersistType.all ); - } - - ids = business.okrWorkReportPersonLinkFactory().listIdsByReportId( id ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrWorkReportPersonLink = emc.find( _id, OkrWorkReportPersonLink.class ); - if ( null != okrWorkReportPersonLink ) { - okrWorkReportPersonLink.setActivityName( "结束" ); - okrWorkReportPersonLink.setStatus( "结束" ); - okrWorkReportPersonLink.setProcessStatus( "自动结束" ); - emc.check( okrWorkReportPersonLink,CheckPersistType.all ); - } - } - } - - if ( null != okrWorkReportDetailInfo ) { - Date now = new Date(); - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - okrWorkReportProcessLog.setActivityName( "结束" ); - okrWorkReportProcessLog.setArriveTime( now ); - okrWorkReportProcessLog.setArriveTimeStr( new DateOperation().getDateStringFromDate( now, "yyyy-MM-dd HH:mm:ss") ); - okrWorkReportProcessLog.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrWorkReportProcessLog.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportProcessLog.setDecision( "结束" ); - okrWorkReportProcessLog.setOpinion( "新汇报已经生成, 原有汇报自动结束" ); - okrWorkReportProcessLog.setProcessLevel( 0 ); - okrWorkReportProcessLog.setProcessTime( now ); - okrWorkReportProcessLog.setProcessTimeStr( new DateOperation().getDateStringFromDate( now, "yyyy-MM-dd HH:mm:ss") ); - okrWorkReportProcessLog.setReportTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setStayTime( 0L ); - okrWorkReportProcessLog.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportProcessLog.setProcessStatus( "已生效" ); - okrWorkReportProcessLog.setWorkReportId( okrWorkReportBaseInfo.getId() ); - okrWorkReportProcessLog.setProcessorName( "system" ); - //保存处理记录 - emc.persist( okrWorkReportProcessLog, CheckPersistType.all ); - } - emc.commit(); - } catch ( Exception e ) { - throw e; - } - - if( okrTaskList != null && okrTaskList.size() > 0 ){ - for( OkrTask task : okrTaskList ){ - List workTypeList = new ArrayList(); - workTypeList.add( task.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( task.getTargetIdentity(), workTypeList ); - } - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportOperationService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportOperationService.java deleted file mode 100644 index 873c4cd142..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportOperationService.java +++ /dev/null @@ -1,629 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportDetailInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -/** - * 类 名：OkrWorkReportBaseInfoService
- * 实体类：OkrWorkReportBaseInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportOperationService{ - private static Logger logger = LoggerFactory.getLogger( OkrWorkReportOperationService.class ); - private OkrWorkBaseInfoQueryService okrWorkBaseInfoQueryService = new OkrWorkBaseInfoQueryService(); - private OkrWorkReportQueryService okrWorkReportQueryService = new OkrWorkReportQueryService(); - private OkrWorkReportFlowService okrWorkReportFlowService = new OkrWorkReportFlowService(); - private OkrSendNotifyService okrNotifyService = new OkrSendNotifyService(); - private DateOperation dateOperation = new DateOperation(); - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - private OkrWorkReportTaskCollectService okrWorkReportTaskCollectService = new OkrWorkReportTaskCollectService(); - - /** - * 向数据库保存OkrWorkReportBaseInfo对象 - * @param wrapIn - * @param workPointAndRequirements - * @param progressDescription 填写汇报时填写的具体进展描述信息 - * @param workPlan 下一步工作计划信息 - * @param adminSuperviseInfo 管理员督办信息 - * @param memo 说明备注信息 - * @param opinion - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo save( OkrWorkReportBaseInfo wrapIn, String workPointAndRequirements, - String progressDescription, String workPlan, String adminSuperviseInfo, String memo, String opinion ) throws Exception { - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - List ids = null; - Business business = null; - - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - okrWorkReportBaseInfo = emc.find( wrapIn.getId(), OkrWorkReportBaseInfo.class ); - okrWorkReportDetailInfo = emc.find( wrapIn.getId(), OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - if( okrWorkReportBaseInfo != null ){//如果信息已经存在，那么不需要更新基础信息 - List attachments = okrWorkReportBaseInfo.getAttachmentList(); - wrapIn.copyTo( okrWorkReportBaseInfo, JpaObject.FieldsUnmodify ); - okrWorkReportBaseInfo.setAttachmentList( attachments ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - }else{//信息不存在，创建一个新的记录 - okrWorkReportBaseInfo = new OkrWorkReportBaseInfo(); - wrapIn.copyTo( okrWorkReportBaseInfo ); - okrWorkReportBaseInfo.setId( wrapIn.getId()); - emc.persist( okrWorkReportBaseInfo, CheckPersistType.all); - } - - if( okrWorkReportDetailInfo != null ){ - okrWorkReportDetailInfo.setId( okrWorkReportBaseInfo.getId() ); - okrWorkReportDetailInfo.setCenterId(okrWorkReportBaseInfo.getCenterId()); - okrWorkReportDetailInfo.setShortTitle( okrWorkReportBaseInfo.getShortTitle() ); - okrWorkReportDetailInfo.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportDetailInfo.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportDetailInfo.setStatus( "正常" ); - okrWorkReportDetailInfo.setWorkPlan( workPlan ); - okrWorkReportDetailInfo.setProgressDescription( progressDescription ); - okrWorkReportDetailInfo.setWorkPointAndRequirements( workPointAndRequirements ); - okrWorkReportDetailInfo.setMemo( memo ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - }else{ - okrWorkReportDetailInfo = new OkrWorkReportDetailInfo(); - okrWorkReportDetailInfo.setId( okrWorkReportBaseInfo.getId() );//使用参数传入的ID作为记录的ID - okrWorkReportDetailInfo.setCenterId(okrWorkReportBaseInfo.getCenterId()); - okrWorkReportDetailInfo.setShortTitle( okrWorkReportBaseInfo.getShortTitle() ); - okrWorkReportDetailInfo.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportDetailInfo.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportDetailInfo.setStatus( "正常" ); - okrWorkReportDetailInfo.setWorkPlan( workPlan ); - okrWorkReportDetailInfo.setProgressDescription( progressDescription ); - okrWorkReportDetailInfo.setWorkPointAndRequirements( workPointAndRequirements ); - okrWorkReportDetailInfo.setMemo( memo ); - emc.persist( okrWorkReportDetailInfo, CheckPersistType.all); - } - - //判断该汇报创建者的待办是否存在，如果不存在就创建一个新的待办 - ids = business.okrTaskFactory().listIdsByTargetActivityAndObjId( "TASK", "工作汇报", okrWorkReportBaseInfo.getId(), "拟稿", okrWorkReportBaseInfo.getReporterIdentity() ); - if( ids == null || ids.isEmpty() ){ - //创建工作汇报的待办 - OkrTask okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrTask.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrTask.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrTask.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle() ); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType() ); - okrTask.setTargetIdentity( okrWorkReportBaseInfo.getReporterIdentity() ); - okrTask.setTargetName( okrWorkReportBaseInfo.getReporterName() ); - okrTask.setTargetUnitName( okrWorkReportBaseInfo.getReporterUnitName() ); - okrTask.setTargetTopUnitName( okrWorkReportBaseInfo.getReporterTopUnitName() ); - okrTask.setActivityName( "拟稿" ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getNowDateTime() ); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId() ); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setDynamicObjectType( "工作汇报" );//工作汇报拟稿 - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - } - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkReportBaseInfo update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - okrWorkReportBaseInfo = new OkrWorkReportBaseInfo(); - wrapIn.copyTo( okrWorkReportBaseInfo ); - - okrWorkReportDetailInfo = new OkrWorkReportDetailInfo(); - okrWorkReportDetailInfo.setId( okrWorkReportBaseInfo.getId() );//使用参数传入的ID作为记录的ID - okrWorkReportDetailInfo.setCenterId(okrWorkReportBaseInfo.getCenterId()); - okrWorkReportDetailInfo.setShortTitle( okrWorkReportBaseInfo.getShortTitle() ); - okrWorkReportDetailInfo.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportDetailInfo.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportDetailInfo.setStatus( "正常" ); - okrWorkReportDetailInfo.setWorkPlan( workPlan ); - okrWorkReportDetailInfo.setProgressDescription( progressDescription ); - okrWorkReportDetailInfo.setWorkPointAndRequirements( workPointAndRequirements ); - okrWorkReportDetailInfo.setMemo( memo ); - emc.persist( okrWorkReportDetailInfo, CheckPersistType.all); - emc.persist( okrWorkReportBaseInfo, CheckPersistType.all); - //判断该汇报创建者的待办是否存在，如果不存在就创建一个新的待办 - //工作汇报拟稿 - ids = business.okrTaskFactory().listIdsByTargetActivityAndObjId( "TASK", "工作汇报", okrWorkReportBaseInfo.getId(), "拟稿", okrWorkReportBaseInfo.getReporterIdentity() ); - if( ids == null || ids.isEmpty() ){ - //创建工作汇报的待办 - OkrTask okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrTask.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrTask.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrTask.setWorkTitle( okrWorkReportBaseInfo.getWorkTitle() ); - okrTask.setWorkType( okrWorkReportBaseInfo.getWorkType() ); - okrTask.setTargetIdentity( okrWorkReportBaseInfo.getReporterIdentity() ); - okrTask.setTargetName( okrWorkReportBaseInfo.getReporterName() ); - okrTask.setTargetUnitName( okrWorkReportBaseInfo.getReporterUnitName() ); - okrTask.setTargetTopUnitName( okrWorkReportBaseInfo.getReporterTopUnitName() ); - okrTask.setActivityName( "拟稿" ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getNowDateTime() ); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId() ); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setDynamicObjectType( "工作汇报" );//工作汇报拟稿 - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - emc.persist( okrTask, CheckPersistType.all ); - } - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkReportBaseInfo create got a error!" ); - throw e; - } - } - - try{ - List workTypeList = new ArrayList(); - workTypeList.add( wrapIn.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( okrWorkReportBaseInfo.getReporterIdentity(), workTypeList ); - }catch( Exception e ){ - logger.warn( "汇报信息保存成功，但对汇报者进行汇报待办汇总发生异常。" ); - throw e; - } - return okrWorkReportBaseInfo; - } - - /** - * 根据ID从数据库中删除OkrWorkReportBaseInfo对象 - * @param id - * @throws Exception - */ - public void delete( String id, String operator ) throws Exception { - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - OkrTask okrTask = null; - OkrTaskHandled okrTaskHandled = null; - List ids = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.beginTransaction( OkrTask.class ); - emc.beginTransaction( OkrTaskHandled.class ); - okrWorkReportBaseInfo = emc.find( id, OkrWorkReportBaseInfo.class ); - if ( null != okrWorkReportBaseInfo ) { - emc.remove( okrWorkReportBaseInfo,CheckRemoveType.all ); - } - //删除所有的汇报详情 - okrWorkReportDetailInfo = emc.find( id, OkrWorkReportDetailInfo.class ); - if ( null != okrWorkReportDetailInfo ) { - emc.remove( okrWorkReportDetailInfo,CheckRemoveType.all ); - } - ids = business.okrWorkReportPersonLinkFactory().listIdsByReportId( id ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrWorkReportPersonLink = emc.find( _id, OkrWorkReportPersonLink.class ); - if ( null != okrWorkReportPersonLink ) { - emc.remove( okrWorkReportPersonLink,CheckRemoveType.all ); - } - } - } - ids = business.okrWorkReportProcessLogFactory().listIdsByReportId( id ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrWorkReportProcessLog = emc.find( _id, OkrWorkReportProcessLog.class ); - if ( null != okrWorkReportProcessLog ) { - emc.remove( okrWorkReportProcessLog,CheckRemoveType.all ); - } - } - } - ids = business.okrTaskFactory().listIdsByReportId( id ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrTask = emc.find( _id, OkrTask.class ); - if ( null != okrTask ) { - emc.remove( okrTask,CheckRemoveType.all ); - } - } - } - ids = business.okrTaskHandledFactory().listIdsByReportId( id ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrTaskHandled = emc.find( _id, OkrTaskHandled.class ); - if ( null != okrTaskHandled ) { - emc.remove( okrTaskHandled,CheckRemoveType.all ); - } - } - } - okrNotifyService.notifyReportDeleteSuccess( okrWorkReportBaseInfo, operator ); - emc.commit(); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID，查询该工作的最大汇报次序 - * @param id - * @return - * @throws Exception - */ - public Integer getMaxReportCount( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().getMaxReportCount( workId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID，删除工作汇报信息 - * @param workId - * @throws Exception - */ - public void deleteByWorkId( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not delete any object." ); - } - List ids = null; - Business business = null; - OkrWorkReportBaseInfo okrWorkReportBaseInfo = null; - OkrWorkReportDetailInfo okrWorkReportDetailInfo = null; - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - - ids = business.okrWorkReportBaseInfoFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - okrWorkReportBaseInfo = business.okrWorkReportBaseInfoFactory().get(id); - okrWorkReportBaseInfo.setStatus( "已删除" ); - emc.check( okrWorkReportBaseInfo, CheckPersistType.all ); - } - } - - ids = business.okrWorkReportDetailInfoFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - okrWorkReportDetailInfo = business.okrWorkReportDetailInfoFactory().get(id); - okrWorkReportDetailInfo.setStatus( "已删除" ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - } - } - - ids = business.okrWorkReportPersonLinkFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - okrWorkReportPersonLink = business.okrWorkReportPersonLinkFactory().get(id); - okrWorkReportPersonLink.setStatus( "已删除" ); - emc.check( okrWorkReportPersonLink, CheckPersistType.all ); - } - } - - ids = business.okrWorkReportProcessLogFactory().listByWorkId( workId ); - if( ListTools.isNotEmpty( ids ) ){ - for( String id : ids ){ - okrWorkReportProcessLog = business.okrWorkReportProcessLogFactory().get(id); - okrWorkReportProcessLog.setStatus( "已删除" ); - emc.check( okrWorkReportProcessLog, CheckPersistType.all ); - } - } - emc.commit(); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 为具体工作生成工作汇报草稿信息，并且推送待办 - * @param string - * @param wrapInOkrWorkReportBaseInfo - * @param okrWorkBaseInfo - * @throws Exception - */ - public OkrWorkReportBaseInfo createReportDraft( OkrWorkBaseInfo okrWorkBaseInfo, String report_auto_over ) throws Exception { - if( okrWorkBaseInfo == null ){ - throw new Exception( "okrWorkBaseInfo is null, can not create report." ); - } - Integer maxReportCount = 0; - Date nextReportTime = null; - List ids = null; - //需要对工作汇报的基础信息进行补全，对审核方式进行校验 - OkrWorkReportBaseInfo okrWorkReportBaseInfo = new OkrWorkReportBaseInfo(); - //查询最大的汇报次数来决定本次汇报的次数 - try { - maxReportCount = getMaxReportCount( okrWorkBaseInfo.getId() ); - if( maxReportCount == null ){ - maxReportCount = 0; - } - okrWorkReportBaseInfo.setReportCount( maxReportCount + 1 ); - } catch (Exception e) { - throw e; - } - - //根据汇报次数确定汇报的标题 - okrWorkReportBaseInfo.setTitle( okrWorkBaseInfo.getTitle() ); - okrWorkReportBaseInfo.setShortTitle( "第" + okrWorkReportBaseInfo.getReportCount() + "次工作汇报" ); - - okrWorkReportBaseInfo.setWorkType( okrWorkBaseInfo.getWorkType() ); - okrWorkReportBaseInfo.setWorkId( okrWorkBaseInfo.getId() ); - okrWorkReportBaseInfo.setWorkTitle( okrWorkBaseInfo.getTitle() ); - okrWorkReportBaseInfo.setCenterId( okrWorkBaseInfo.getCenterId() ); - okrWorkReportBaseInfo.setCenterTitle( okrWorkBaseInfo.getCenterTitle() ); - - okrWorkReportBaseInfo.setProcessStatus( "草稿" ); - okrWorkReportBaseInfo.setStatus( "正常" ); - okrWorkReportBaseInfo.setProcessType( "审批" ); - okrWorkReportBaseInfo.setProgressPercent(0); - okrWorkReportBaseInfo.setIsWorkCompleted(false); - - //创建者是系统创建 - okrWorkReportBaseInfo.setCreatorTopUnitName( "SYSTEM" ); - okrWorkReportBaseInfo.setCreatorIdentity( "SYSTEM" ); - okrWorkReportBaseInfo.setCreatorName( "SYSTEM" ); - okrWorkReportBaseInfo.setCreatorUnitName( "SYSTEM" ); - - //汇报是工作的责任者 - okrWorkReportBaseInfo.setReporterTopUnitName( okrWorkBaseInfo.getResponsibilityTopUnitName() ); - okrWorkReportBaseInfo.setReporterIdentity( okrWorkBaseInfo.getResponsibilityIdentity() ); - okrWorkReportBaseInfo.setReporterName( okrWorkBaseInfo.getResponsibilityEmployeeName() ); - okrWorkReportBaseInfo.setReporterUnitName( okrWorkBaseInfo.getResponsibilityUnitName() ); - - //当前处理者是工作的责任者，汇报还是草稿状态 - List names = new ArrayList<>(); - List identities = new ArrayList<>(); - List unitNames = new ArrayList<>(); - List topUnitNames = new ArrayList<>(); - names.add( okrWorkBaseInfo.getResponsibilityEmployeeName() ); - identities.add( okrWorkBaseInfo.getResponsibilityIdentity() ); - unitNames.add( okrWorkBaseInfo.getResponsibilityUnitName() ); - topUnitNames.add( okrWorkBaseInfo.getResponsibilityTopUnitName() ); - - okrWorkReportBaseInfo.setCurrentProcessorTopUnitNameList( topUnitNames ); - okrWorkReportBaseInfo.setCurrentProcessorIdentityList( identities ); - okrWorkReportBaseInfo.setCurrentProcessorNameList( names ); - okrWorkReportBaseInfo.setCurrentProcessorUnitNameList( unitNames ); - //判断汇报的审批方式可以放在提交的时候进行 - okrWorkReportBaseInfo.setNeedAdminAudit(false); - okrWorkReportBaseInfo.setWorkAdminIdentity( "" ); //工作督办员身份 - okrWorkReportBaseInfo.setWorkAdminName( "" ); //工作督办员姓名 - - //创建工作汇报的待办 - OkrTask okrTask = new OkrTask(); - okrTask.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setCenterId( okrWorkBaseInfo.getCenterId() ); - okrTask.setCenterTitle( okrWorkBaseInfo.getCenterTitle() ); - okrTask.setWorkId( okrWorkBaseInfo.getId() ); - okrTask.setWorkTitle( okrWorkBaseInfo.getTitle() ); - okrTask.setWorkType( okrWorkBaseInfo.getWorkType() ); - okrTask.setTargetIdentity( okrWorkReportBaseInfo.getReporterIdentity() ); - okrTask.setTargetName( okrWorkReportBaseInfo.getReporterName() ); - okrTask.setTargetUnitName( okrWorkReportBaseInfo.getReporterUnitName() ); - okrTask.setTargetTopUnitName( okrWorkReportBaseInfo.getReporterTopUnitName() ); - okrTask.setActivityName( "拟稿" ); - okrTask.setArriveDateTime( new Date() ); - okrTask.setArriveDateTimeStr( dateOperation.getNowDateTime() ); - okrTask.setDynamicObjectId( okrWorkReportBaseInfo.getId() ); - okrTask.setDynamicObjectTitle( okrWorkReportBaseInfo.getTitle() ); - okrTask.setDynamicObjectType( "工作汇报" );//工作汇报拟稿 - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setViewUrl( "" ); - - //从计算好的汇报时间序列里找出下一次汇报时间，如果找不到，那么留为null - //定时代理WorkProgressConfirm会对下一次汇报时间为空的，未完成的工作进行工作汇报时间计算，自动延时 - nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime( okrWorkBaseInfo.getReportTimeQue(), okrTask.getArriveDateTime() ); - logger.info( "work id：" + okrWorkBaseInfo.getId() + "lastreporttime: "+ okrWorkBaseInfo.getLastReportTime() +" nextreporttime1:" + nextReportTime ); - if( nextReportTime == null ){ - nextReportTime = okrWorkBaseInfoQueryService.getNextReportTime( okrWorkBaseInfo ); - } - logger.info( "work id：" + okrWorkBaseInfo.getId() + "lastreporttime: "+ okrWorkBaseInfo.getLastReportTime() +" nextreporttime2:" + nextReportTime ); - if( report_auto_over != null && "OPEN".equals( report_auto_over )){ - //根据配置查询该工作所有正在流转中的工作汇报ID列表,包括草稿 - try { - ids = okrWorkReportQueryService.listProcessingReportIdsByWorkId( okrWorkBaseInfo.getId() ); - if ( ids != null && !ids.isEmpty() ) { - for (String id : ids) { - logger.info( "system try to dispatch exists report to over，id：" + id ); - okrWorkReportFlowService.dispatchToOver( id ); - } - } - } catch (Exception e) { - logger.warn( "system dispatch processing report to over got an exception." ); - logger.error(e); - } - } - - //保存数据到数据库中 - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkBaseInfo = emc.find( okrWorkBaseInfo.getId(), OkrWorkBaseInfo.class ); - if( okrWorkBaseInfo != null ){ - emc.beginTransaction(OkrWorkReportBaseInfo.class); - emc.beginTransaction(OkrWorkBaseInfo.class); - emc.beginTransaction(OkrTask.class); - //还要修改工作的下一次汇报信息 - okrWorkBaseInfo.setNextReportTime( nextReportTime ); - okrWorkBaseInfo.setLastReportTime( okrTask.getArriveDateTime() ); - okrWorkBaseInfo.setReportCount( okrWorkReportBaseInfo.getReportCount() ); - // 保存汇报基础信息 - emc.persist( okrWorkReportBaseInfo, CheckPersistType.all ); - // 保存汇报待办 - emc.persist( okrTask, CheckPersistType.all ); - emc.check( okrWorkBaseInfo, CheckPersistType.all ); - emc.commit(); - logger.info( "system try to save new report draft.id：" + okrWorkReportBaseInfo.getId() ); - logger.info( "system try to update work report time and count.id：" + okrWorkBaseInfo.getId() ); - } - } catch (Exception e) { - throw e; - } - - if( okrTask != null ){ - List workTypeList = new ArrayList(); - workTypeList.add( okrTask.getWorkType() ); - okrWorkReportTaskCollectService.checkReportCollectTask( okrTask.getTargetIdentity(), workTypeList ); - } - - return okrWorkReportBaseInfo; - } - - public void saveAdminSuperviseInfo( String reportId, String adminSuperviseInfo ) throws Exception { - if( reportId == null ){ - throw new Exception( "reportId is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - OkrWorkReportDetailInfo okrWorkReportDetailInfo = emc.find( reportId, OkrWorkReportDetailInfo.class ); - if( okrWorkReportDetailInfo != null ){ - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - okrWorkReportDetailInfo.setAdminSuperviseInfo( adminSuperviseInfo ); - emc.check( okrWorkReportDetailInfo, CheckPersistType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - /** - * 保存汇报审阅信息 - * @param wrapIn - * @throws Exception - */ - public void saveLeaderOpinionInfo( OkrWorkReportBaseInfo okrWorkReportBaseInfo, String opinion, String processorIdentity ) throws Exception { - Business business = null; - List ids = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - if( okrWorkReportBaseInfo == null ){ - throw new Exception( "okrWorkReportBaseInfo is null!" ); - } - if( opinion == null ){ - throw new Exception( "opinion is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - ids = business.okrWorkReportProcessLogFactory().listByReportIdAndProcessor( okrWorkReportBaseInfo.getId(), okrWorkReportBaseInfo.getActivityName(), processorIdentity, "草稿" ); - - emc.beginTransaction( OkrWorkReportDetailInfo.class ); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - - if( ids != null && !ids.isEmpty() ){ - //有数据需要更新 - for( String id : ids ){ - okrWorkReportProcessLog = emc.find( id, OkrWorkReportProcessLog.class ); - if( okrWorkReportProcessLog != null ){ - okrWorkReportProcessLog.setOpinion( opinion ); - emc.check( okrWorkReportProcessLog, CheckPersistType.all ); - } - } - }else{ - //没有数据，需要创建新的日志 - String personName = okrUserManagerService.getPersonNameByIdentity( processorIdentity ); - if( personName != null ){ - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - okrWorkReportProcessLog.setArriveTime( new Date() ); - okrWorkReportProcessLog.setArriveTimeStr( dateOperation.getNowDateTime()); - okrWorkReportProcessLog.setCenterId( okrWorkReportBaseInfo.getCenterId() ); - okrWorkReportProcessLog.setCenterTitle( okrWorkReportBaseInfo.getCenterTitle() ); - okrWorkReportProcessLog.setDecision( "保存" ); - okrWorkReportProcessLog.setOpinion( opinion ); - okrWorkReportProcessLog.setActivityName( "领导批示" ); - okrWorkReportProcessLog.setProcessStatus( "草稿" ); - okrWorkReportProcessLog.setProcessLevel( okrWorkReportBaseInfo.getCurrentProcessLevel() ); - okrWorkReportProcessLog.setProcessTime( new Date() ); - okrWorkReportProcessLog.setProcessTimeStr( dateOperation.getNowDateTime() ); - okrWorkReportProcessLog.setReportTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setStayTime( 0L ); - okrWorkReportProcessLog.setTitle( okrWorkReportBaseInfo.getTitle() ); - okrWorkReportProcessLog.setWorkId( okrWorkReportBaseInfo.getWorkId() ); - okrWorkReportProcessLog.setWorkReportId( okrWorkReportBaseInfo.getId() ); - okrWorkReportProcessLog.setProcessorName( personName ); - okrWorkReportProcessLog.setProcessorUnitName( okrUserManagerService.getUnitNameByIdentity( processorIdentity ) ); - okrWorkReportProcessLog.setProcessorIdentity( processorIdentity ); - okrWorkReportProcessLog.setProcessorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity( processorIdentity ) ); - - emc.persist( okrWorkReportProcessLog, CheckPersistType.all ); - } - } - - emc.commit(); - } catch ( Exception e ) { - throw e; - } - } - - public OkrAttachmentFileInfo saveAttachment(String reportId, OkrAttachmentFileInfo attachment) throws Exception { - if( reportId == null ){ - throw new Exception( "reportId is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - OkrWorkReportBaseInfo report = emc.find( reportId, OkrWorkReportBaseInfo.class ); - if( report != null ){ - emc.beginTransaction( OkrAttachmentFileInfo.class ); - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - emc.persist(attachment, CheckPersistType.all ); - if( report.getAttachmentList()== null ) { - report.setAttachmentList( new ArrayList<>()); - } - if( !report.getAttachmentList().contains( attachment.getId() )) { - report.getAttachmentList().add( attachment.getId() ); - emc.check( report, CheckPersistType.all ); - } - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - return attachment; - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportPersonLinkService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportPersonLinkService.java deleted file mode 100644 index 1c3b68c22c..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportPersonLinkService.java +++ /dev/null @@ -1,252 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.WorkPersonSearchFilter; -import com.x.okr.entity.OkrWorkReportPersonLink; - -/** - * 类 名：OkrWorkReportPersonLinkService
- * 实体类：OkrWorkReportPersonLink
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportPersonLinkService{ - private static Logger logger = LoggerFactory.getLogger( OkrWorkReportPersonLinkService.class ); - - /** - * 根据传入的ID从数据库查询OkrWorkReportPersonLink对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkReportPersonLink get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrWorkReportPersonLink.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrWorkReportPersonLink对象 - * @param wrapIn - */ - public OkrWorkReportPersonLink save( OkrWorkReportPersonLink wrapIn ) throws Exception { - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkReportPersonLink = emc.find( wrapIn.getId(), OkrWorkReportPersonLink.class ); - if( okrWorkReportPersonLink != null ){ - emc.beginTransaction( OkrWorkReportPersonLink.class ); - wrapIn.copyTo( okrWorkReportPersonLink, JpaObject.FieldsUnmodify ); - emc.check( okrWorkReportPersonLink, CheckPersistType.all ); - emc.commit(); - }else{ - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - wrapIn.copyTo( okrWorkReportPersonLink ); - okrWorkReportPersonLink.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrWorkReportPersonLink, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrWorkReportPersonLink update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkReportPersonLink = new OkrWorkReportPersonLink(); - emc.beginTransaction( OkrWorkReportPersonLink.class ); - wrapIn.copyTo( okrWorkReportPersonLink ); - emc.persist( okrWorkReportPersonLink, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkReportPersonLink create got a error!" ); - throw e; - } - } - return okrWorkReportPersonLink; - } - - /** - * 根据ID从数据库中删除OkrWorkReportPersonLink对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrWorkReportPersonLink okrWorkReportPersonLink = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkReportPersonLink = emc.find(id, OkrWorkReportPersonLink.class); - if (null == okrWorkReportPersonLink) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrWorkReportPersonLink.class ); - emc.remove( okrWorkReportPersonLink, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - /** - * 根据汇报ID获取该汇报的最高处理过程级别 - * @param reportId - * @return - * @throws Exception - */ - public Integer getMaxProcessLevel( String reportId ) throws Exception { - if( reportId == null || reportId.isEmpty() ){ - throw new Exception( "reportId is null, system can not get maxProcessLevel for report." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrWorkReportPersonLinkFactory().getMaxProcessLevel(reportId); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 列示指定Id的OkrWorkReportPersonLink实体信息列表 - * @param ids - * @return - * @throws Exception - */ - public List list( List ids ) throws Exception { - if( ids == null || ids.isEmpty() ){ - throw new Exception( "ids is null." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrWorkReportPersonLinkFactory().list(ids); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据汇报ID和处理等级来查询指定等级的处理人 - * @param id - * @param processLevel - * @return - * @throws Exception - */ - public List getProcessPersonLinkInfoByReportAndLevel(String reportId, Integer processLevel, String processorIdentity, String processStatus, String status ) throws Exception { - if( reportId == null || reportId.isEmpty() ){ - throw new Exception( "reportId is null." ); - } - if( processLevel == null || processLevel < 0 ){ - throw new Exception( "processLevel is invalid, processLevel = "+ processLevel ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business( emc ); - return business.okrWorkReportPersonLinkFactory().getProcessPersonLinkInfoByReportAndLevel( reportId, processLevel, processorIdentity, processStatus, status ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 下一页 - * @param id - * @param count - * @param wrapIn - * @return - * @throws Exception - */ - public List listNextWithFilter( String id, Integer count, WorkPersonSearchFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - List okrWorkReportPersonLinkList = new ArrayList(); - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkReportPersonLink.class ), JpaObject.sequence_FIELDNAME ); - } - } - okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().listNextWithFilter( id, count, sequence, wrapIn ); - } catch ( Exception e ) { - throw e; - } - return okrWorkReportPersonLinkList; - } - - /** - * 上一页 - * @param id - * @param count - * @param wrapIn - * @return - * @throws Exception - */ - public List listPrevWithFilter( String id, Integer count, WorkPersonSearchFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - List okrWorkReportPersonLinkList = new ArrayList(); - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkReportPersonLink.class ), JpaObject.sequence_FIELDNAME ); - } - } - okrWorkReportPersonLinkList = business.okrWorkReportPersonLinkFactory().listPrevWithFilter( id, count, sequence, wrapIn ); - } catch ( Exception e ) { - throw e; - } - return okrWorkReportPersonLinkList; - } - - public Long getCountWithFilter( WorkPersonSearchFilter wrapIn ) throws Exception { - Business business = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportPersonLinkFactory().getCountWithFilter(wrapIn); - } catch ( Exception e ) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportProcessLogService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportProcessLogService.java deleted file mode 100644 index 51b10b0f94..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportProcessLogService.java +++ /dev/null @@ -1,216 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.WrapInFilter; -import com.x.okr.entity.OkrWorkReportProcessLog; - -/** - * 类 名：OkrWorkReportProcessLogService
- * 实体类：OkrWorkReportProcessLog
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportProcessLogService{ - - private static Logger logger = LoggerFactory.getLogger( OkrWorkReportProcessLogService.class ); - - /** - * 根据传入的ID从数据库查询OkrWorkReportProcessLog对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkReportProcessLog get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrWorkReportProcessLog.class ); - }catch( Exception e ){ - throw e; - } - } - - /** - * 向数据库保存OkrWorkReportProcessLog对象 - * @param wrapIn - */ - public OkrWorkReportProcessLog save( OkrWorkReportProcessLog wrapIn ) throws Exception { - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - if( wrapIn.getId() !=null && wrapIn.getId().trim().length() > 20 ){ - //根据ID查询信息是否存在，如果存在就update，如果不存在就create - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkReportProcessLog = emc.find( wrapIn.getId(), OkrWorkReportProcessLog.class ); - if( okrWorkReportProcessLog != null ){ - emc.beginTransaction( OkrWorkReportProcessLog.class ); - wrapIn.copyTo( okrWorkReportProcessLog, JpaObject.FieldsUnmodify ); - emc.check( okrWorkReportProcessLog, CheckPersistType.all ); - emc.commit(); - }else{ - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - wrapIn.copyTo( okrWorkReportProcessLog ); - okrWorkReportProcessLog.setId( wrapIn.getId() );//使用参数传入的ID作为记录的ID - emc.persist( okrWorkReportProcessLog, CheckPersistType.all); - emc.commit(); - } - }catch( Exception e ){ - logger.warn( "OkrWorkReportProcessLog update/ got a error!" ); - throw e; - } - }else{//没有传入指定的ID - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - okrWorkReportProcessLog = new OkrWorkReportProcessLog(); - emc.beginTransaction( OkrWorkReportProcessLog.class ); - wrapIn.copyTo( okrWorkReportProcessLog ); - emc.persist( okrWorkReportProcessLog, CheckPersistType.all); - emc.commit(); - }catch( Exception e ){ - logger.warn( "OkrWorkReportProcessLog create got a error!", e); - throw e; - } - } - return okrWorkReportProcessLog; - } - - /** - * 根据ID从数据库中删除OkrWorkReportProcessLog对象 - * @param id - * @throws Exception - */ - public void delete( String id ) throws Exception { - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作 - okrWorkReportProcessLog = emc.find(id, OkrWorkReportProcessLog.class); - if (null == okrWorkReportProcessLog) { - throw new Exception( "object is not exist {'id':'"+ id +"'}" ); - }else{ - emc.beginTransaction( OkrWorkReportProcessLog.class ); - emc.remove( okrWorkReportProcessLog, CheckRemoveType.all ); - emc.commit(); - } - } catch ( Exception e ) { - throw e; - } - } - - public List listNextWithFilter( String id, Integer count, WrapInFilter wrapIn) throws Exception { - Business business = null; - Object sequence = null; - OkrWorkReportProcessLog okrWorkReportProcessLog = null; - List okrWorkReportProcessLogList = new ArrayList(); - List ids = null; - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkReportProcessLog.class ), JpaObject.sequence_FIELDNAME ); - } - } - ids = business.okrWorkReportProcessLogFactory().listNextWithFilter( id, count, sequence, wrapIn ); - if( ids != null && !ids.isEmpty() ){ - for( String _id : ids ){ - okrWorkReportProcessLog = emc.find( _id, OkrWorkReportProcessLog.class ); - if( okrWorkReportProcessLogList != null && !okrWorkReportProcessLogList.contains( okrWorkReportProcessLog )){ - okrWorkReportProcessLogList.add( okrWorkReportProcessLog ); - } - } - } - } catch ( Exception e ) { - throw e; - } - return okrWorkReportProcessLogList; - } - - public Long getCountWithFilter( WrapInFilter wrapIn ) throws Exception { - Business business = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportProcessLogFactory().getCountWithFilter(wrapIn); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据汇报ID，环节和处理人查询正在处理的日志，“草稿” - * @param id - * @param activityName - * @param userIdentity - * @return - * @throws Exception - */ - public List listByReportIdAndProcessor(String reportId, String activityName, String userIdentity, String procrssStatus) throws Exception { - Business business = null; - if( reportId == null ){ - throw new Exception( "reportId is null!" ); - } - if( activityName == null ){ - throw new Exception( "activityName is null!" ); - } - if( userIdentity == null ){ - throw new Exception( "userIdentity is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportProcessLogFactory().listByReportIdAndProcessor(reportId, activityName, userIdentity, procrssStatus); - } catch ( Exception e ) { - throw e; - } - } - - public List list(List ids) throws Exception { - Business business = null; - if( ids == null ){ - throw new Exception( "ids is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportProcessLogFactory().list( ids ); - } catch ( Exception e ) { - throw e; - } - } - - public List listByReportId( String id ) throws Exception { - Business business = null; - if( id == null ){ - throw new Exception( "id is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportProcessLogFactory().listIdsByReportId( id ); - } catch ( Exception e ) { - throw e; - } - } - -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportQueryService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportQueryService.java deleted file mode 100644 index b704533d68..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportQueryService.java +++ /dev/null @@ -1,217 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.okr.assemble.control.Business; -import com.x.okr.assemble.control.jaxrs.okrworkreportbaseinfo.WrapInFilter; -import com.x.okr.entity.OkrWorkReportBaseInfo; - -/** - * 类 名：OkrWorkReportBaseInfoService
- * 实体类：OkrWorkReportBaseInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 -**/ -public class OkrWorkReportQueryService{ - - /** - * 根据传入的ID从数据库查询OkrWorkReportBaseInfo对象 - * @param id - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo get( String id ) throws Exception { - if( id == null || id.isEmpty() ){ - throw new Exception( "id is null, return null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - return emc.find( id, OkrWorkReportBaseInfo.class ); - }catch( Exception e ){ - throw e; - } - } - - - - - /** - * 根据工作ID，查询该工作的最大汇报次序 - * @param id - * @return - * @throws Exception - */ - public Integer getMaxReportCount( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().getMaxReportCount( workId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID查询所有汇报信息ID列表 - * @param workId - * @return - * @throws Exception - */ - public List listByWorkId( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().listByWorkId( workId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID查询所有正在流转中的汇报信息ID列表 - * @param workId - * @return - * @throws Exception - */ - public List listProcessingReportIdsByWorkId( String workId ) throws Exception { - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null." ); - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().listProcessingReportIdsByWorkId( workId ); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据汇报信息ID列表，查询汇报信息对象 - * @param ids - * @return - * @throws Exception - */ - public List listByIds(List ids) throws Exception { - if( ids == null || ids.isEmpty() ){ - return null; - } - Business business = null; - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().list(ids); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 下一页 - * @param id - * @param count - * @param wrapIn - * @return - * @throws Exception - */ - public List listNextWithFilter( String id, Integer count, WrapInFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - List okrWorkReportBaseInfoList = new ArrayList(); - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkReportBaseInfo.class ), JpaObject.sequence_FIELDNAME ); - } - } - okrWorkReportBaseInfoList = business.okrWorkReportBaseInfoFactory().listNextWithFilter( id, count, sequence, wrapIn ); - } catch ( Exception e ) { - throw e; - } - return okrWorkReportBaseInfoList; - } - - /** - * 上一页 - * @param id - * @param count - * @param wrapIn - * @return - * @throws Exception - */ - public List listPrevWithFilter( String id, Integer count, WrapInFilter wrapIn ) throws Exception { - Business business = null; - Object sequence = null; - List okrWorkReportBaseInfoList = new ArrayList(); - if( count == null ){ - count = 20; - } - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - if( id != null && !"(0)".equals(id) && id.trim().length() > 20 ){ - if (!StringUtils.equalsIgnoreCase(id, StandardJaxrsAction.EMPTY_SYMBOL)) { - sequence = PropertyUtils.getProperty( emc.find( id, OkrWorkReportBaseInfo.class ), JpaObject.sequence_FIELDNAME ); - } - } - okrWorkReportBaseInfoList = business.okrWorkReportBaseInfoFactory().listPrevWithFilter( id, count, sequence, wrapIn ); - } catch ( Exception e ) { - throw e; - } - return okrWorkReportBaseInfoList; - } - - public Long getCountWithFilter( WrapInFilter wrapIn ) throws Exception { - Business business = null; - if( wrapIn == null ){ - throw new Exception( "wrapIn is null!" ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().getCountWithFilter(wrapIn); - } catch ( Exception e ) { - throw e; - } - } - - /** - * 根据工作ID获取该工作最后一次工作汇报 - * @param workId - * @return - * @throws Exception - */ - public OkrWorkReportBaseInfo getLastReportBaseInfo(String workId) throws Exception { - Business business = null; - if( workId == null || workId.isEmpty() ){ - throw new Exception( "workId is null, system can not delete any object." ); - } - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - return business.okrWorkReportBaseInfoFactory().getLastReportBaseInfo( workId ); - } catch ( Exception e ) { - throw e; - } - } -} diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportTaskCollectService.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportTaskCollectService.java deleted file mode 100644 index 30809aeadf..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/OkrWorkReportTaskCollectService.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.x.okr.assemble.control.service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.okr.assemble.common.date.DateOperation; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrConfigWorkType; -import com.x.okr.entity.OkrTask; - -/** - * 类 名：OkrWorkReportBaseInfoService
- * 实体类：OkrWorkReportBaseInfo
- * 作 者：Liyi
- * 单 位：O2 Team
- * 日 期：2016-05-20 17:17:27 - **/ -public class OkrWorkReportTaskCollectService { - - private OkrUserManagerService okrUserManagerService = new OkrUserManagerService(); - private OkrTaskService okrTaskService = new OkrTaskService(); - private OkrWorkPersonService okrWorkPersonService = new OkrWorkPersonService(); - private OkrConfigWorkTypeService okrConfigWorkTypeService = new OkrConfigWorkTypeService(); - private DateOperation dateOperation = new DateOperation(); - - public boolean checkAllReportCollectTask() throws Exception { - - //List taskTypeList = new ArrayList(); - List targetIdentities = null; - List workTypeList = null; - List workTypeNameList = new ArrayList(); - //taskTypeList.add( "工作汇报" ); - //taskTypeList.add( "工作汇报汇总" ); - - //logger.debug( "系统尝试对所有用户进行工作汇报汇总待办进行核对......" ); - // 获取工作汇报待办以及所有工作汇报汇总待办涉及到的所有员工身份 - //targetIdentities = okrTaskService.listDistinctIdentity( taskTypeList ); - // 获取工作所有干系人身份 - targetIdentities = okrWorkPersonService.listDistinctIdentity(); - - // 遍历所有的员工身份，查询该员工的汇总待办是否已经存在，如果存在则不作处理，如果不存在，则删除汇总待办 - //taskTypeList.clear(); - //taskTypeList.add( "工作汇报" ); - - workTypeList = okrConfigWorkTypeService.listAll(); - if( workTypeList != null && !workTypeList.isEmpty() ){ - for( OkrConfigWorkType workType : workTypeList ){ - workTypeNameList.add( workType.getWorkTypeName() ); - } - } - if (targetIdentities != null && !targetIdentities.isEmpty()) { - for (String targetIdentity : targetIdentities) { - checkReportCollectTask( targetIdentity, workTypeNameList ); - } - } - - return true; - } - - public boolean checkReportCollectTask( String userIdentity, List workTypeList ) throws Exception { - - List taskTypeList = new ArrayList(); - List okrTasks = null; - OkrTask okrTask = null; - Long taskCount = 0L; - Business business = null; - String personName = okrUserManagerService.getPersonNameByIdentity( userIdentity ); - - if ( personName != null ) { - //logger.debug( "对用户[" + userIdentity + "]进行工作汇报汇总待办进行核对......" ); - // 遍历所有的员工身份，查询该员工的汇总待办是否已经存在，如果存在则不作处理，如果不存在，则删除汇总待办 - taskTypeList.clear(); - taskTypeList.add( "工作汇报" ); - - //根据不同的工作类别进行汇总 - for( String workType : workTypeList ){ - taskCount = okrTaskService.getNotReportConfirmTaskCount( taskTypeList, userIdentity, workType ); - // 查询汇总待办是否存在，如果不存在，则新增一条汇总待办 - try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - business = new Business(emc); - //查询该员工是否已经存在工作汇报汇总信息 - taskTypeList.clear(); - taskTypeList.add( "工作汇报汇总" ); - okrTasks = business.okrTaskFactory().listTaskByTaskType( taskTypeList, userIdentity, workType ); - emc.beginTransaction( OkrTask.class ); - if ( taskCount != null && taskCount > 0 ) { - if ( okrTasks == null || okrTasks.isEmpty() ) { - okrTask = new OkrTask(); - okrTask.setTitle( "重点工作布置落实推进情况反馈( " + workType + " )" ); - okrTask.setDynamicObjectTitle( "重点工作布置落实推进情况反馈( " + workType + " )" ); - okrTask.setTargetIdentity(userIdentity); - okrTask.setTargetName( personName ); - okrTask.setTargetUnitName( okrUserManagerService.getUnitNameByIdentity(userIdentity)); - okrTask.setTargetTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(userIdentity)); - okrTask.setActivityName( "汇总" ); - okrTask.setArriveDateTime(new Date()); - okrTask.setArriveDateTimeStr(dateOperation.getNowDateTime()); - okrTask.setDynamicObjectType( "工作汇报汇总" ); - okrTask.setProcessType( "TASK" ); - okrTask.setStatus( "正常" ); - okrTask.setCenterId( "" ); - okrTask.setCenterTitle( "" ); - okrTask.setWorkId( "" ); - okrTask.setWorkTitle( "" ); - okrTask.setDynamicObjectId( "" ); - okrTask.setWorkType( workType ); - okrTask.setViewUrl( "" ); - emc.persist(okrTask, CheckPersistType.all); - }else{ - for( int i=0; i identityMap = new HashMap<>(); - static { - identityMap.put("", ""); - } - public static String getIdentityWithOldName( String _oldName ) { - if( identityMap.get( _oldName ) != null ) { - return (String)identityMap.get( _oldName ); - } - return null; - } - - public static Map getIdentityMap() { - return identityMap; - } - - public static void setIdentityMap(Map identityMap) { - UpdateIdentityMap.identityMap = identityMap; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit.java deleted file mode 100644 index 026a4c9c58..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit.java +++ /dev/null @@ -1,519 +0,0 @@ -package com.x.okr.assemble.control.service.update; - -import java.lang.reflect.InvocationTargetException; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrConfigSecretary; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrUserInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class UpdateOldUnitToNewUnit { - - private static Logger logger = LoggerFactory.getLogger( UpdateOldUnitToNewUnit.class ); - - /** - * 根据对照表，替换相关数据中的人员、身份、组织信息 - * @throws Exception - */ - public void processReplace() throws Exception { - process_table_OKR_ATTACHMENTFILEINFO(); - process_table_OKR_CENTERWORKINFO(); - process_table_OKR_CONFIG_SECRETARY(); - process_table_OKR_STATISTIC_REPORT_CONTENT(); - process_table_OKR_STATISTIC_REPORT_STATUS(); - process_table_OKR_TASK(); - process_table_OKR_TASKHANDLED(); - process_table_OKR_USERINFO(); - process_table_OKR_WORK_AUTHORIZE_RECORD(); - process_table_OKR_WORK_PERSON(); - process_table_OKR_WORK_REPORT_PERSONLINK(); - process_table_OKR_WORK_REPORT_PROCESSLOG(); - process_table_OKR_WORK_REPORTBASEINFO(); - process_table_OKR_WORKBASEINFO(); - process_table_OKR_WORKCHAT(); - process_table_OKR_WORKDYNAMICS(); - } - - public void process_table_OKR_ATTACHMENTFILEINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrAttachmentFileInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrAttachmentFileInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrAttachmentFileInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrAttachmentFileInfo.class ); - if( entity != null ) { - changePropertyValue( entity, "creatorUid", "person" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_CENTERWORKINFO() throws Exception { - List all_center_ids = null; - Business business = null; - OkrCenterWorkInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_center_ids = business.okrCenterWorkInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_center_ids )) { - emc.beginTransaction( OkrCenterWorkInfo.class ); - for( String _id : all_center_ids ) { - entity = emc.find( _id, OkrCenterWorkInfo.class ); - if( entity != null ) { - changePropertyValue( entity, "creatorIdentity", "identity" ); - changePropertyValue( entity, "deployerIdentity", "identity" ); - changePropertyValue( entity, "reportAuditLeaderIdentity", "identity" ); - changePropertyValue( entity, "creatorName", "person" ); - changePropertyValue( entity, "deployerName", "person" ); - changePropertyValue( entity, "reportAuditLeaderName", "person" ); - changePropertyValue( entity, "creatorTopUnitName", "unit" ); - changePropertyValue( entity, "creatorUnitName", "unit" ); - changePropertyValue( entity, "deployerTopUnitName", "unit" ); - changePropertyValue( entity, "deployerUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - //OKR_CONFIG_SECRETARY - public void process_table_OKR_CONFIG_SECRETARY() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrConfigSecretary entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrConfigSecretaryFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrConfigSecretary.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrConfigSecretary.class ); - if( entity != null ) { - changePropertyValue( entity, "leaderIdentity", "identity" ); - changePropertyValue( entity, "secretaryIdentity", "identity" ); - changePropertyValue( entity, "leaderName", "person" ); - changePropertyValue( entity, "secretaryName", "person" ); - changePropertyValue( entity, "leaderTopUnitName", "unit" ); - changePropertyValue( entity, "leaderUnitName", "unit" ); - changePropertyValue( entity, "secretaryTopUnitName", "unit" ); - changePropertyValue( entity, "secretaryUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_STATISTIC_REPORT_CONTENT() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrStatisticReportContent entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrStatisticReportContentFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrStatisticReportContent.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrStatisticReportContent.class ); - if( entity != null ) { - changePropertyValue( entity, "responsibilityIdentity", "identity" ); - changePropertyValue( entity, "responsibilityEmployeeName", "person" ); - changePropertyValue( entity, "responsibilityTopUnitName", "unit" ); - changePropertyValue( entity, "responsibilityUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_STATISTIC_REPORT_STATUS() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrStatisticReportStatus entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrStatisticReportStatusFactory().listAllIds(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrStatisticReportStatus.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrStatisticReportStatus.class ); - if( entity != null ) { - changePropertyValue( entity, "responsibilityIdentity", "identity" ); - changePropertyValue( entity, "responsibilityEmployeeName", "person" ); - changePropertyValue( entity, "responsibilityTopUnitName", "unit" ); - changePropertyValue( entity, "responsibilityUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_TASK() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrTask entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrTaskFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrTask.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrTask.class ); - if( entity != null ) { - changePropertyValue( entity, "targetIdentity", "identity" ); - changePropertyValue( entity, "targetName", "person" ); - changePropertyValue( entity, "targetTopUnitName", "unit" ); - changePropertyValue( entity, "targetUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_TASKHANDLED() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrTaskHandled entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrTaskHandledFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrTaskHandled.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrTaskHandled.class ); - if( entity != null ) { - changePropertyValue( entity, "targetIdentity", "identity" ); - changePropertyValue( entity, "targetName", "person" ); - changePropertyValue( entity, "targetTopUnitName", "unit" ); - changePropertyValue( entity, "targetUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_USERINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrUserInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrUserInfoFactory().listAllIds(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrUserInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrUserInfo.class ); - if( entity != null ) { - changePropertyValue( entity, "userName", "person" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_AUTHORIZE_RECORD() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkAuthorizeRecord entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkAuthorizeRecordFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkAuthorizeRecord.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkAuthorizeRecord.class ); - if( entity != null ) { - changePropertyValue( entity, "delegatorIdentity", "identity" ); - changePropertyValue( entity, "targetIdentity", "identity" ); - changePropertyValue( entity, "delegatorName", "person" ); - changePropertyValue( entity, "targetName", "person" ); - changePropertyValue( entity, "delegatorTopUnitName", "unit" ); - changePropertyValue( entity, "targetTopUnitName", "unit" ); - changePropertyValue( entity, "delegatorUnitName", "unit" ); - changePropertyValue( entity, "targetUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_PERSON() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkPerson entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkPersonFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkPerson.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkPerson.class ); - if( entity != null ) { - changePropertyValue( entity, "employeeIdentity", "identity" ); - changePropertyValue( entity, "processIdentity", "identity" ); - changePropertyValue( entity, "employeeName", "person" ); - changePropertyValue( entity, "topUnitName", "unit" ); - changePropertyValue( entity, "unitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_REPORT_PERSONLINK() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkReportPersonLink entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkReportPersonLinkFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkReportPersonLink.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkReportPersonLink.class ); - if( entity != null ) { - changePropertyValue( entity, "processorIdentity", "identity" ); - changePropertyValue( entity, "processorName", "person" ); - changePropertyValue( entity, "processorTopUnitName", "unit" ); - changePropertyValue( entity, "processorUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_REPORT_PROCESSLOG() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkReportProcessLog entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkReportProcessLogFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkReportProcessLog.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkReportProcessLog.class ); - if( entity != null ) { - changePropertyValue( entity, "processorIdentity", "identity" ); - changePropertyValue( entity, "processorName", "person" ); - changePropertyValue( entity, "processorTopUnitName", "unit" ); - changePropertyValue( entity, "processorUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_REPORTBASEINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkReportBaseInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkReportBaseInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkReportBaseInfo.class ); - if( entity != null ) { - changePropertyValue( entity, "creatorIdentity", "identity" ); - changePropertyValue( entity, "currentProcessorIdentity", "identity" ); - changePropertyValue( entity, "readLeadersIdentity", "identity" ); - changePropertyValue( entity, "reporterIdentity", "identity" ); - changePropertyValue( entity, "workAdminIdentity", "identity" ); - changePropertyValue( entity, "creatorName", "identity" ); - changePropertyValue( entity, "currentProcessorName", "person" ); - changePropertyValue( entity, "readLeadersName", "person" ); - changePropertyValue( entity, "reporterName", "person" ); - changePropertyValue( entity, "workAdminName", "person" ); - changePropertyValue( entity, "creatorTopUnitName", "unit" ); - changePropertyValue( entity, "currentProcessorTopUnitName", "unit" ); - changePropertyValue( entity, "reporterTopUnitName", "unit" ); - changePropertyValue( entity, "creatorUnitName", "unit" ); - changePropertyValue( entity, "currentProcessorUnitName", "unit" ); - changePropertyValue( entity, "reporterUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORKBASEINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkBaseInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkBaseInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkBaseInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkBaseInfo.class ); - if( entity != null ) { - changePropertyValue( entity, "cooperateIdentity", "identity" ); - changePropertyValue( entity, "creatorIdentity", "identity" ); - changePropertyValue( entity, "deployerIdentity", "identity" ); - changePropertyValue( entity, "readLeaderIdentity", "identity" ); - changePropertyValue( entity, "reportAdminIdentity", "identity" ); - changePropertyValue( entity, "responsibilityIdentity", "identity" ); - changePropertyValue( entity, "cooperateEmployeeName", "person" ); - changePropertyValue( entity, "creatorName", "person" ); - changePropertyValue( entity, "deployerName", "person" ); - changePropertyValue( entity, "readLeaderName", "person" ); - changePropertyValue( entity, "reportAdminName", "person" ); - changePropertyValue( entity, "responsibilityEmployeeName", "person" ); - changePropertyValue( entity, "cooperateTopUnitName", "unit" ); - changePropertyValue( entity, "creatorTopUnitName", "unit" ); - changePropertyValue( entity, "deployerTopUnitName", "unit" ); - changePropertyValue( entity, "readLeaderTopUnitName", "unit" ); - changePropertyValue( entity, "responsibilityTopUnitName", "unit" ); - changePropertyValue( entity, "cooperateUnitName", "unit" ); - changePropertyValue( entity, "creatorUnitName", "unit" ); - changePropertyValue( entity, "deployerUnitName", "unit" ); - changePropertyValue( entity, "readLeaderUnitName", "unit" ); - changePropertyValue( entity, "responsibilityUnitName", "unit" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORKCHAT() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkChat entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkChatFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkChat.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkChat.class ); - if( entity != null ) { - changePropertyValue( entity, "senderIdentity", "identity" ); - changePropertyValue( entity, "targetIdentity", "identity" ); - changePropertyValue( entity, "senderName", "person" ); - changePropertyValue( entity, "targetName", "person" ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORKDYNAMICS() throws Exception { - List all_entity_ids = null; - Business business = null; - OkrWorkDynamics entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkDynamicsFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkDynamics.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkDynamics.class ); - if( entity != null ) { - changePropertyValue( entity, "targetIdentity", "identity" ); - changePropertyValue( entity, "operatorName", "person" ); - changePropertyValue( entity, "targetName", "person" ); - emc.check(entity, CheckPersistType.all ); - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - private void changePropertyValue(Object entity, String propertyName, String propertyType) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - String old_name = null; - String new_name = null; - String get_methodName = "get"+propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1); - String set_methodName = "set"+propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1); - Object result = entity.getClass().getMethod(get_methodName, null).invoke(entity, null); - if( result != null && StringUtils.isNotEmpty(old_name)) { - old_name = (String)result; - if("identity".equals(propertyType)) { - new_name = UpdateIdentityMap.getIdentityWithOldName( old_name ); - }else if ("person".equals(propertyType)) { - new_name = UpdatePersonMap.getPersonWithOldName( old_name ); - }else if ("unit".equals(propertyType)) { - new_name = UpdateUnitMap.getUnitWithOldName( old_name ); - } - if( StringUtils.isNotEmpty(old_name) ) { - entity.getClass().getMethod(set_methodName, null).invoke(entity, new_name); - } - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit2.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit2.java deleted file mode 100644 index dc4f5356c5..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateOldUnitToNewUnit2.java +++ /dev/null @@ -1,985 +0,0 @@ -package com.x.okr.assemble.control.service.update; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.ListTools; -import com.x.okr.assemble.control.Business; -import com.x.okr.entity.OkrAttachmentFileInfo; -import com.x.okr.entity.OkrCenterWorkInfo; -import com.x.okr.entity.OkrConfigSecretary; -import com.x.okr.entity.OkrStatisticReportContent; -import com.x.okr.entity.OkrStatisticReportStatus; -import com.x.okr.entity.OkrTask; -import com.x.okr.entity.OkrTaskHandled; -import com.x.okr.entity.OkrUserInfo; -import com.x.okr.entity.OkrWorkAuthorizeRecord; -import com.x.okr.entity.OkrWorkBaseInfo; -import com.x.okr.entity.OkrWorkChat; -import com.x.okr.entity.OkrWorkDynamics; -import com.x.okr.entity.OkrWorkPerson; -import com.x.okr.entity.OkrWorkReportBaseInfo; -import com.x.okr.entity.OkrWorkReportPersonLink; -import com.x.okr.entity.OkrWorkReportProcessLog; - -public class UpdateOldUnitToNewUnit2 { - - private static Logger logger = LoggerFactory.getLogger( UpdateOldUnitToNewUnit2.class ); - - public void processReplace() throws Exception { - process_table_OKR_ATTACHMENTFILEINFO(); - process_table_OKR_CENTERWORKINFO(); - process_table_OKR_CONFIG_SECRETARY(); - process_table_OKR_STATISTIC_REPORT_CONTENT(); - process_table_OKR_STATISTIC_REPORT_STATUS(); - process_table_OKR_TASK(); - process_table_OKR_TASKHANDLED(); - process_table_OKR_USERINFO(); - process_table_OKR_WORK_AUTHORIZE_RECORD(); - process_table_OKR_WORK_PERSON(); - process_table_OKR_WORK_REPORT_PERSONLINK(); - process_table_OKR_WORK_REPORT_PROCESSLOG(); - process_table_OKR_WORK_REPORTBASEINFO(); - process_table_OKR_WORKBASEINFO(); - process_table_OKR_WORKCHAT(); - process_table_OKR_WORKDYNAMICS(); - } - - public void process_table_OKR_ATTACHMENTFILEINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrAttachmentFileInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrAttachmentFileInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrAttachmentFileInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrAttachmentFileInfo.class ); - if( entity != null ) { - old_name = entity.getCreatorUid(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setCreatorUid( UpdatePersonMap.getPersonWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_CENTERWORKINFO() throws Exception { - List all_center_ids = null; - Business business = null; - String old_name = null; - OkrCenterWorkInfo okrCenterWorkInfo = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_center_ids = business.okrCenterWorkInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_center_ids )) { - emc.beginTransaction( OkrCenterWorkInfo.class ); - for( String _id : all_center_ids ) { - okrCenterWorkInfo = emc.find( _id, OkrCenterWorkInfo.class ); - if( okrCenterWorkInfo != null ) { - old_name = okrCenterWorkInfo.getCreatorIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setCreatorIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = okrCenterWorkInfo.getDeployerIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setDeployerIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - - Listold_names = okrCenterWorkInfo.getReportAuditLeaderIdentityList(); - List new_names = new ArrayList<>(); - if( ListTools.isNotEmpty(old_names)) { - for( String name : old_names ) { - if( UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - new_names.add( UpdateIdentityMap.getIdentityWithOldName( old_name ) ); - }else { - new_names.add( name ); - } - } - okrCenterWorkInfo.setReportAuditLeaderIdentityList( new_names ); - } - - old_name = okrCenterWorkInfo.getCreatorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setCreatorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = okrCenterWorkInfo.getDeployerName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setDeployerName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - - old_names = okrCenterWorkInfo.getReportAuditLeaderNameList(); - new_names = new ArrayList<>(); - if( StringUtils.isNotEmpty(old_name) ) { - for( String name : old_names ) { - if( UpdatePersonMap.getPersonWithOldName( name ) != null ) { - new_names.add( UpdatePersonMap.getPersonWithOldName( name ) ); - }else { - new_names.add( name ); - } - } - okrCenterWorkInfo.setReportAuditLeaderNameList( new_names ); - } - - old_name = okrCenterWorkInfo.getCreatorTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setCreatorTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = okrCenterWorkInfo.getCreatorUnitName(); - if( UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setCreatorUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = okrCenterWorkInfo.getDeployerTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setDeployerTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = okrCenterWorkInfo.getDeployerUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - okrCenterWorkInfo.setDeployerUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - //OKR_CONFIG_SECRETARY - public void process_table_OKR_CONFIG_SECRETARY() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrConfigSecretary entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrConfigSecretaryFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrConfigSecretary.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrConfigSecretary.class ); - if( entity != null ) { - old_name = entity.getLeaderIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setLeaderIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getSecretaryIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setSecretaryIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getLeaderName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setLeaderName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getSecretaryName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setSecretaryName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getLeaderTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setLeaderTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getLeaderUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setLeaderUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getSecretaryTopUnitName(); - if( UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setSecretaryTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getSecretaryUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setSecretaryUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_STATISTIC_REPORT_CONTENT() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrStatisticReportContent entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrStatisticReportContentFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrStatisticReportContent.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrStatisticReportContent.class ); - if( entity != null ) { - old_name = entity.getResponsibilityIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setResponsibilityIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getResponsibilityEmployeeName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setResponsibilityEmployeeName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getResponsibilityTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setResponsibilityTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getResponsibilityUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setResponsibilityUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_STATISTIC_REPORT_STATUS() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrStatisticReportStatus entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrStatisticReportStatusFactory().listAllIds(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrStatisticReportStatus.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrStatisticReportStatus.class ); - if( entity != null ) { - old_name = entity.getResponsibilityIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setResponsibilityIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getResponsibilityEmployeeName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setResponsibilityEmployeeName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getResponsibilityTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setResponsibilityTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getResponsibilityUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setResponsibilityUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_TASK() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrTask entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrTaskFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrTask.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrTask.class ); - if( entity != null ) { - old_name = entity.getTargetIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setTargetIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getTargetName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setTargetName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getTargetTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTargetTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getTargetUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTargetUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_TASKHANDLED() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrTaskHandled entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrTaskHandledFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrTaskHandled.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrTaskHandled.class ); - if( entity != null ) { - old_name = entity.getTargetIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setTargetIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getTargetName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setTargetName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getTargetTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTargetTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getTargetUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTargetUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_USERINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrUserInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrUserInfoFactory().listAllIds(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrUserInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrUserInfo.class ); - if( entity != null ) { - old_name = entity.getUserName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setUserName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_AUTHORIZE_RECORD() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkAuthorizeRecord entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkAuthorizeRecordFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkAuthorizeRecord.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkAuthorizeRecord.class ); - if( entity != null ) { - old_name = entity.getDelegatorIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setDelegatorIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getTargetIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setTargetIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getDelegatorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setDelegatorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getTargetName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setTargetName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getDelegatorTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setDelegatorTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getTargetTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTargetTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getDelegatorUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setDelegatorUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getTargetUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTargetUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_PERSON() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkPerson entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkPersonFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkPerson.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkPerson.class ); - if( entity != null ) { - old_name = entity.getEmployeeIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setEmployeeIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getProcessIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setProcessIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getEmployeeName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setEmployeeName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_REPORT_PERSONLINK() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkReportPersonLink entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkReportPersonLinkFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkReportPersonLink.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkReportPersonLink.class ); - if( entity != null ) { - old_name = entity.getProcessorIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setProcessorIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getProcessorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setProcessorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getProcessorTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setProcessorTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getProcessorUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setProcessorUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_REPORT_PROCESSLOG() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkReportProcessLog entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkReportProcessLogFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkReportProcessLog.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkReportProcessLog.class ); - if( entity != null ) { - old_name = entity.getProcessorIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setProcessorIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getProcessorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setProcessorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getProcessorTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setProcessorTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getProcessorUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setProcessorUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORK_REPORTBASEINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkReportBaseInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkReportBaseInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkReportBaseInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkReportBaseInfo.class ); - if( entity != null ) { - old_name = entity.getCreatorIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setCreatorIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - - List old_identities = entity.getCurrentProcessorIdentityList(); - if( ListTools.isNotEmpty( old_identities )){ - List new_identities = new ArrayList<>(); - for( String name : old_identities) { - if( UpdateIdentityMap.getIdentityWithOldName( name ) != null ) { - new_identities.add( UpdateIdentityMap.getIdentityWithOldName(name) ); - }else { - new_identities.add( name ); - } - } - entity.setCurrentProcessorIdentityList( new_identities ); - } - - old_identities = entity.getReadLeadersIdentityList(); - if( ListTools.isNotEmpty(old_identities) ) { - List new_identities = new ArrayList<>(); - for( String name : old_identities ) { - if( UpdateIdentityMap.getIdentityWithOldName( name ) != null ) { - new_identities.add( UpdateIdentityMap.getIdentityWithOldName( name ) ); - }else { - new_identities.add( name ); - } - } - entity.setReadLeadersIdentityList( new_identities ); - } - - old_name = entity.getReporterIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setReporterIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getWorkAdminIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setWorkAdminIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getCreatorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setCreatorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - - List old_names = entity.getCurrentProcessorNameList(); - if( ListTools.isNotEmpty( old_names )){ - List new_names = new ArrayList<>(); - for( String name : old_names) { - if( UpdatePersonMap.getPersonWithOldName( name ) != null ) { - new_names.add( UpdatePersonMap.getPersonWithOldName(name) ); - }else { - new_names.add( name ); - } - } - entity.setCurrentProcessorNameList( new_names ); - } - - old_names = entity.getReadLeadersNameList(); - if( ListTools.isNotEmpty( old_names )){ - List new_names = new ArrayList<>(); - for( String name : old_names) { - if( UpdatePersonMap.getPersonWithOldName( name ) != null ) { - new_names.add( UpdatePersonMap.getPersonWithOldName(name) ); - }else { - new_names.add( name ); - } - } - entity.setReadLeadersNameList( new_names ); - } - - old_name = entity.getReporterName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setReporterName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getWorkAdminName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setWorkAdminName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getCreatorTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setCreatorTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - - List old_unitNames = entity.getCurrentProcessorTopUnitNameList(); - if( ListTools.isNotEmpty( old_names )){ - List new_unitNames = new ArrayList<>(); - for( String name : old_unitNames) { - if( UpdateUnitMap.getUnitWithOldName( name ) != null ) { - new_unitNames.add( UpdateUnitMap.getUnitWithOldName(name) ); - }else { - new_unitNames.add( name ); - } - } - entity.setCurrentProcessorTopUnitNameList( new_unitNames ); - } - - old_name = entity.getReporterTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setReporterTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getCreatorUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setCreatorUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - - old_unitNames = entity.getCurrentProcessorUnitNameList(); - if( ListTools.isNotEmpty( old_names )){ - List new_unitNames = new ArrayList<>(); - for( String name : old_unitNames) { - if( UpdateUnitMap.getUnitWithOldName( name ) != null ) { - new_unitNames.add( UpdateUnitMap.getUnitWithOldName(name) ); - }else { - new_unitNames.add( name ); - } - } - entity.setCurrentProcessorUnitNameList( new_unitNames ); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORKBASEINFO() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - List old_names = null; - List new_names = null; - OkrWorkBaseInfo entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkBaseInfoFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkBaseInfo.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkBaseInfo.class ); - - if( entity != null ) { - - old_names = entity.getCooperateIdentityList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdateIdentityMap.getIdentityWithOldName( old_name ) != null) { - new_names.add( UpdateIdentityMap.getIdentityWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setCooperateIdentityList( new_names ); - - old_names = entity.getReadLeaderIdentityList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdateIdentityMap.getIdentityWithOldName( old_name ) != null) { - new_names.add( UpdateIdentityMap.getIdentityWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setReadLeaderIdentityList( new_names ); - - old_names = entity.getCooperateEmployeeNameList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdatePersonMap.getPersonWithOldName( old_name ) != null) { - new_names.add( UpdatePersonMap.getPersonWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setCooperateEmployeeNameList( new_names ); - - old_names = entity.getReadLeaderNameList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdatePersonMap.getPersonWithOldName( old_name ) != null) { - new_names.add( UpdatePersonMap.getPersonWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setReadLeaderNameList( new_names ); - - old_names = entity.getCooperateTopUnitNameList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdateUnitMap.getUnitWithOldName( old_name ) != null) { - new_names.add( UpdateUnitMap.getUnitWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setCooperateTopUnitNameList( new_names ); - - old_names = entity.getReadLeaderTopUnitNameList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdateUnitMap.getUnitWithOldName( old_name ) != null) { - new_names.add( UpdateUnitMap.getUnitWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setReadLeaderTopUnitNameList( new_names ); - - old_names = entity.getCooperateUnitNameList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdateUnitMap.getUnitWithOldName( old_name ) != null) { - new_names.add( UpdateUnitMap.getUnitWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setCooperateUnitNameList( new_names ); - - old_names = entity.getReadLeaderUnitNameList(); - new_names = new ArrayList<>(); - if( ListTools.isNotEmpty( old_names ) ) { - for( String identity : old_names ) { - if( UpdateUnitMap.getUnitWithOldName( old_name ) != null) { - new_names.add( UpdateUnitMap.getUnitWithOldName(old_name) ); - }else { - new_names.add( identity ); - } - } - } - entity.setReadLeaderUnitNameList( new_names ); - - old_name = entity.getCreatorIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setCreatorIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getDeployerIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setDeployerIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getReportAdminIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setReportAdminIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getResponsibilityIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setResponsibilityIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getCreatorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setCreatorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getDeployerName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setDeployerName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getReportAdminName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setReportAdminName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getResponsibilityEmployeeName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setResponsibilityEmployeeName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getCreatorTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setCreatorTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getDeployerTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setDeployerTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getResponsibilityTopUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setResponsibilityTopUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getCreatorUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setCreatorUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getDeployerUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setDeployerUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - old_name = entity.getResponsibilityUnitName(); - if( StringUtils.isNotEmpty(old_name) && UpdateUnitMap.getUnitWithOldName( old_name ) != null ) { - entity.setResponsibilityUnitName( UpdateUnitMap.getUnitWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORKCHAT() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkChat entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkChatFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkChat.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkChat.class ); - if( entity != null ) { - old_name = entity.getSenderIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setSenderIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getTargetIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setTargetIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getSenderName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setSenderName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getTargetName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setTargetName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - public void process_table_OKR_WORKDYNAMICS() throws Exception { - List all_entity_ids = null; - Business business = null; - String old_name = null; - OkrWorkDynamics entity = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - business = new Business(emc); - all_entity_ids = business.okrWorkDynamicsFactory().listAll(); - if( ListTools.isNotEmpty(all_entity_ids )) { - emc.beginTransaction( OkrWorkDynamics.class ); - for( String _id : all_entity_ids ) { - entity = emc.find( _id, OkrWorkDynamics.class ); - if( entity != null ) { - old_name = entity.getTargetIdentity(); - if( StringUtils.isNotEmpty(old_name) && UpdateIdentityMap.getIdentityWithOldName( old_name ) != null ) { - entity.setTargetIdentity( UpdateIdentityMap.getIdentityWithOldName(old_name)); - } - old_name = entity.getOperatorName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setOperatorName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - old_name = entity.getTargetName(); - if( StringUtils.isNotEmpty(old_name) && UpdatePersonMap.getPersonWithOldName( old_name ) != null ) { - entity.setTargetName( UpdatePersonMap.getPersonWithOldName(old_name)); - } - } - } - emc.commit(); - } - }catch( Exception e ){ - throw e; - } - } - - private void changePropertyValue(Object entity, String propertyName, String propertyType) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - String old_name = null; - String new_name = null; - String get_methodName = "get"+propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1); - String set_methodName = "set"+propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1); - Object result = entity.getClass().getMethod(get_methodName, null).invoke(entity, null); - if( result != null && StringUtils.isNotEmpty(old_name)) { - old_name = (String)result; - if("identity".equals(propertyType)) { - new_name = UpdateIdentityMap.getIdentityWithOldName( old_name ); - }else if ("person".equals(propertyType)) { - new_name = UpdatePersonMap.getPersonWithOldName( old_name ); - }else if ("unit".equals(propertyType)) { - new_name = UpdateUnitMap.getUnitWithOldName( old_name ); - } - if( StringUtils.isNotEmpty(old_name) ) { - entity.getClass().getMethod(set_methodName, null).invoke(entity, new_name); - } - } - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdatePersonMap.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdatePersonMap.java deleted file mode 100644 index fe9a5cb633..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdatePersonMap.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.x.okr.assemble.control.service.update; - -import java.util.HashMap; -import java.util.Map; - -public class UpdatePersonMap { - - private static Map personMap = new HashMap<>(); - static { - personMap.put("", ""); - } - public static String getPersonWithOldName( String _oldName ) { - if( personMap.get( _oldName ) != null ) { - return (String)personMap.get( _oldName ); - } - return null; - } - - public static Map getPersonMap() { - return personMap; - } - - public static void setPersonMap(Map personMap) { - UpdatePersonMap.personMap = personMap; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateUnitMap.java b/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateUnitMap.java deleted file mode 100644 index de1c77e836..0000000000 --- a/o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/service/update/UpdateUnitMap.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.x.okr.assemble.control.service.update; - -import java.util.HashMap; -import java.util.Map; - -public class UpdateUnitMap { - - private static Map unitMap = new HashMap<>(); - static { - unitMap.put("", ""); - } - public static String getUnitWithOldName( String _oldName ) { - if( unitMap.get( _oldName ) != null ) { - return (String)unitMap.get( _oldName ); - } - return null; - } - - public static Map getUnitMap() { - return unitMap; - } - - public static void setUnitMap(Map unitMap) { - UpdateUnitMap.unitMap = unitMap; - } -} \ No newline at end of file diff --git a/o2server/x_okr_assemble_control/src/main/resources/o2CodeGenerateConfig.properties b/o2server/x_okr_assemble_control/src/main/resources/o2CodeGenerateConfig.properties deleted file mode 100644 index 3a1feac77d..0000000000 --- a/o2server/x_okr_assemble_control/src/main/resources/o2CodeGenerateConfig.properties +++ /dev/null @@ -1,14 +0,0 @@ -entityClass=com.x.okr.entity.OkrAttachmentFileInfo -entityClass=com.x.okr.entity.OkrConfigSystem -entityClass=com.x.okr.entity.OkrConfigWorkLevel -entityClass=com.x.okr.entity.OkrConfigWorkType -entityClass=com.x.okr.entity.OkrTask -entityClass=com.x.okr.entity.OkrTaskHandled -entityClass=com.x.okr.entity.OkrWorkAuthorizeRecord -entityClass=com.x.okr.entity.OkrWorkDetailInfo -entityClass=com.x.okr.entity.OkrWorkDynamics -entityClass=com.x.okr.entity.OkrWorkProcessLink -entityClass=com.x.okr.entity.OkrWorkReportBaseInfo -entityClass=com.x.okr.entity.OkrWorkReportDetailInfo -entityClass=com.x.okr.entity.OkrWorkReportPersonLink -entityClass=com.x.okr.entity.OkrWorkReportProcessLog \ No newline at end of file diff --git "a/o2server/x_okr_assemble_control/src/test/java/\346\234\252\345\256\214\346\210\220\347\232\204\345\212\237\350\203\275\347\202\271.txt" "b/o2server/x_okr_assemble_control/src/test/java/\346\234\252\345\256\214\346\210\220\347\232\204\345\212\237\350\203\275\347\202\271.txt" deleted file mode 100644 index f0bd15af15..0000000000 --- "a/o2server/x_okr_assemble_control/src/test/java/\346\234\252\345\256\214\346\210\220\347\232\204\345\212\237\350\203\275\347\202\271.txt" +++ /dev/null @@ -1,33 +0,0 @@ -一、优化部分 - 1、工作信息权限过滤： - 1）当前做法：先从workPerson里获取当前用户可以看到的所有工作，或者中心工作的ID，然后根据指定的参数查询工作或者中心工作信息之后，最后使用 - 先前查出的有权限查看的ID进行交集。 - 2）问题：如果用户有权限查看的工作数量比较大时查询就会产生问题，in里的参数条目数过多了。 - 3）优化方案：在workPerson里冗余需要进行过滤和排序的列，在workPerson进行最终的查询和过滤，并且做好分页，最后查出来分页后的ID，在具体的工 - 作或者中心工作信息表里，只根据ID查询少量的数据即可。 - - 权限：负责人，部署人，协助人，阅知人 - 标题，类别，等级 - - 2、数据删除的权限控制 - 3、数据修改的权限控制 - -二、功能建设部分 - 1、工作在部署时记录好工作处理链，以备以后使用 - 2、工作部署的功能要调试 - 3、按状态进行工作查询的功能 - 4、工作待办信息要调试 - 5、待办处理功能 - - 我部署的工作 - 我负责的工作 - 我协助的工作 - 我阅知的工作 - - 根据工作ID，查询该工作的所有工作汇报信息列表 - 根据工作ID，查询该工作的所有问题请示信息列表 - 根据工作ID，查询该工作的所有工作交流信息列表 - - 2、工作汇报处理的功能 - 3、工作汇报删除的功能 - 4、工作汇报相关查询和分页功能 \ No newline at end of file diff --git a/o2server/x_okr_core_entity/pom.xml b/o2server/x_okr_core_entity/pom.xml deleted file mode 100644 index 3411282456..0000000000 --- a/o2server/x_okr_core_entity/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - 4.0.0 - - o2oa - o2server - 5 - - x_okr_core_entity - jar - - - o2oa - x_base_core_project - - - - - - org.codehaus.mojo - exec-maven-plugin - - - TableBuilder - prepare-package - - java - - - true - true - true - com.x.base.core.project.annotation.TableBuilder - - ${basedir} - ${project.build.sourceDirectory} - - - - - metaModelBuilder - generate-sources - - java - - - true - true - true - com.x.base.core.entity.tools.MetaModelBuilder - - ${basedir} - ${project.build.sourceDirectory} - ${project.build.outputDirectory} - - - - - enhanceBuilder - process-classes - - java - - - true - true - true - com.x.base.core.entity.tools.EnhanceBuilder - - ${project.build.directory} - ${project.build.outputDirectory} - - - - - checkCore - prepare-package - - java - - - true - true - true - com.x.base.core.project.build.CheckCore - - - - - - maven-resources-plugin - - - copy-jar - verify - - copy-resources - - - ../store/jars - - - target - - ${project.artifactId}.jar - - - - - - - - - maven-compiler-plugin - - - initialize - - compile - - - - - - - \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrAttachmentFileInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrAttachmentFileInfo.java deleted file mode 100644 index 61d33a2c22..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrAttachmentFileInfo.java +++ /dev/null @@ -1,480 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.Storage; -import com.x.base.core.entity.StorageObject; -import com.x.base.core.entity.StorageType; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.tools.DateTools; - -/** - * 附件文件信息管理表 - * - */ -@ContainerEntity(dumpSize = 5, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrAttachmentFileInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrAttachmentFileInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -@Storage(type = StorageType.okr) -public class OkrAttachmentFileInfo extends StorageObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrAttachmentFileInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - - public static final String lastUpdateTime_FIELDNAME = "lastUpdateTime"; - @FieldDescribe("最后更新时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + lastUpdateTime_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + lastUpdateTime_FIELDNAME) - @CheckPersist(allowEmpty = false) - private Date lastUpdateTime; - - public static final String storage_FIELDNAME = "storage"; - @FieldDescribe("关联的存储名称.") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + storage_FIELDNAME) - @CheckPersist(allowEmpty = false) - @Index(name = TABLE + IndexNameMiddle + storage_FIELDNAME) - private String storage; - - @Override - public Date getLastUpdateTime() { - return lastUpdateTime; - } - - @Override - public void setLastUpdateTime(Date lastUpdateTime) { - this.lastUpdateTime = lastUpdateTime; - } - - @Override - public String getStorage() { - return storage; - } - - @Override - public void setStorage(String storage) { - this.storage = storage; - } - - @Override - public Boolean getDeepPath() { - return BooleanUtils.isTrue(this.deepPath); - } - - @Override - public void setDeepPath(Boolean deepPath) { - this.deepPath = deepPath; - } - - @Override - public String path() throws Exception { - if (null == this.centerId) { - throw new Exception("centerId can not be null."); - } - if (StringUtils.isEmpty(id)) { - throw new Exception("id can not be empty."); - } - String str = DateTools.format(this.getCreateTime(), DateTools.formatCompact_yyyyMMdd); - str += PATHSEPARATOR; - str += this.centerId; - str += PATHSEPARATOR; - str += this.id; - str += StringUtils.isEmpty(this.extension) ? "" : ("." + this.extension); - return str; - } - - /* - * ========================================================================= - * ========= 以上为 JpaObject 默认字段 - * ========================================================================= - * ========= - */ - - /* - * ========================================================================= - * ========= 以下为具体不同的业务及数据表字段要求 - * ========================================================================= - * ========= - */ - public static final String name_FIELDNAME = "name"; - @FieldDescribe("文件真实名称") - @Column(length = AbstractPersistenceProperties.processPlatform_name_length, name = ColumnNamePrefix - + name_FIELDNAME) - @CheckPersist(fileNameString = true, allowEmpty = true) - private String name; - - public static final String fileName_FIELDNAME = "fileName"; - @FieldDescribe("服务器上编码后的文件名,为了方便辨识带扩展名") - @Column(length = AbstractPersistenceProperties.processPlatform_name_length, name = ColumnNamePrefix - + fileName_FIELDNAME) - @CheckPersist(fileNameString = true, allowEmpty = true) - private String fileName; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("文件所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId; - - public static final String workInfoId_FIELDNAME = "workInfoId"; - @FieldDescribe("文件所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workInfoId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workInfoId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workInfoId; - - public static final String parentType_FIELDNAME = "parentType"; - @FieldDescribe("对象类别:中心工作、工作、工作汇报、问题请示") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + parentType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String parentType; - - public static final String key_FIELDNAME = "key"; - @FieldDescribe("关键字:存储关键字，工作ID，汇报ID或者问题请示ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + key_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String key; - - public static final String fileHost_FIELDNAME = "fileHost"; - @FieldDescribe("文件存储主机名") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + fileHost_FIELDNAME) - private String fileHost; - - public static final String filePath_FIELDNAME = "filePath"; - @FieldDescribe("文件存储路径") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + filePath_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String filePath; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("文件说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description; - - public static final String creatorUid_FIELDNAME = "creatorUid"; - @FieldDescribe("创建者UID") - @Column(length = AbstractPersistenceProperties.processPlatform_name_length, name = ColumnNamePrefix - + creatorUid_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorUid; - - public static final String extension_FIELDNAME = "extension"; - @FieldDescribe("扩展名") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + extension_FIELDNAME) - @CheckPersist(fileNameString = true, allowEmpty = true) - private String extension; - - public static final String length_FIELDNAME = "length"; - @FieldDescribe("文件大小.") - @Column(name = ColumnNamePrefix + length_FIELDNAME) - @Index(name = TABLE + "_length") - @CheckPersist(allowEmpty = true) - private Long length; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String status = "正常"; - - public static final String site_FIELDNAME = "site"; - @FieldDescribe("附件框分类.") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + site_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String site; - - public static final String deepPath_FIELDNAME = "deepPath"; - @FieldDescribe("是否使用更深的路径.") - @CheckPersist(allowEmpty = true) - @Column(name = ColumnNamePrefix + deepPath_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deepPath_FIELDNAME) - private Boolean deepPath; - - /** - * 获取分类说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置分类说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * 获取分类创建者帐号 - * - * @return - */ - public String getCreatorUid() { - return creatorUid; - } - - /** - * 设置分类创建者帐号 - * - * @param creatorUid - */ - public void setCreatorUid(String creatorUid) { - this.creatorUid = creatorUid; - } - - /** - * 获取文件名称：服务器上编码后的文件名,为了方便辨识带扩展名 - * - * @return - */ - public String getFileName() { - return fileName; - } - - /** - * 设置文件名称：服务器上编码后的文件名,为了方便辨识带扩展名 - * - * @param fileName - */ - public void setFileName(String fileName) { - this.fileName = fileName; - } - - /** - * 获取文件存储的主机名 - * - * @return - */ - public String getFileHost() { - return fileHost; - } - - /** - * 设置文件存储的主机名 - * - * @param fileHost - */ - public void setFileHost(String fileHost) { - this.fileHost = fileHost; - } - - /** - * 获取文件存储的路径 - * - * @return - */ - public String getFilePath() { - return filePath; - } - - /** - * 设置文件存储的路径 - * - * @param filePath - */ - public void setFilePath(String filePath) { - this.filePath = filePath; - } - - /** - * 获取文件真实名称 - * - * @return - */ - public String getName() { - return name; - } - - /** - * 设置文件真实名称 - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - /** - * 获取文件扩展名 - * - * @return - */ - public String getExtension() { - return extension; - } - - /** - * 设置文件扩展名 - * - * @param extension - */ - public void setExtension(String extension) { - this.extension = extension; - } - - /** - * 获取文件大小 - * - * @return - */ - public Long getLength() { - return length; - } - - /** - * 设置文件大小 - * - * @param length - */ - public void setLength(Long length) { - this.length = length; - } - - /** - * 获取所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取文件所属工作ID - * - * @return - */ - public String getWorkInfoId() { - return workInfoId; - } - - /** - * 设置文件所属工作ID - * - * @param workInfoId - */ - public void setWorkInfoId(String workInfoId) { - this.workInfoId = workInfoId; - } - - /** - * 获取对象类别:中心工作、工作、工作汇报、问题请示 - * - * @return - */ - public String getParentType() { - return parentType; - } - - /** - * 设置对象类别:中心工作、工作、工作汇报、问题请示 - * - * @param parentType - */ - public void setParentType(String parentType) { - this.parentType = parentType; - } - - /** - * 获取关键字:存储关键字，工作ID，汇报ID或者问题请示ID - * - * @return - */ - public String getKey() { - return key; - } - - /** - * 设置关键字:存储关键字，工作ID，汇报ID或者问题请示ID - * - * @param key - */ - public void setKey(String key) { - this.key = key; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 附件控件框 - * - * @return - */ - public String getSite() { - return site; - } - - public void setSite(String site) { - this.site = site; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrCenterWorkInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrCenterWorkInfo.java deleted file mode 100644 index 3d82fb08e0..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrCenterWorkInfo.java +++ /dev/null @@ -1,760 +0,0 @@ -package com.x.okr.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.PersistentCollection; -import org.apache.openjpa.persistence.jdbc.ContainerTable; -import org.apache.openjpa.persistence.jdbc.ElementColumn; -import org.apache.openjpa.persistence.jdbc.ElementIndex; -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 中心工作信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrCenterWorkInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrCenterWorkInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrCenterWorkInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrCenterWorkInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String title_FIELDNAME = "title"; - @FieldDescribe("中心标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = ""; - - public static final String deployYear_FIELDNAME = "deployYear"; - @FieldDescribe("工作部署年份") - @Column(length = JpaObject.length_8B, name = ColumnNamePrefix + deployYear_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deployYear_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployYear = ""; - - public static final String deployMonth_FIELDNAME = "deployMonth"; - @FieldDescribe("工作部署月份") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + deployMonth_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deployMonth_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployMonth = ""; - - public static final String deployerName_FIELDNAME = "deployerName"; - @FieldDescribe("部署者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerName = ""; - - public static final String deployerIdentity_FIELDNAME = "deployerIdentity"; - @FieldDescribe("部署者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerIdentity = ""; - - public static final String deployerUnitName_FIELDNAME = "deployerUnitName"; - @FieldDescribe("部署者所属组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerUnitName = ""; - - public static final String deployerTopUnitName_FIELDNAME = "deployerTopUnitName"; - @FieldDescribe("部署者所属顶层组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerTopUnitName = ""; - - public static final String creatorName_FIELDNAME = "creatorName"; - @FieldDescribe("创建者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorName = ""; - - public static final String creatorIdentity_FIELDNAME = "creatorIdentity"; - @FieldDescribe("创建者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorIdentity = ""; - - public static final String creatorUnitName_FIELDNAME = "creatorUnitName"; - @FieldDescribe("创建者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorUnitName = ""; - - public static final String creatorTopUnitName_FIELDNAME = "creatorTopUnitName"; - @FieldDescribe("创建者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorTopUnitName = ""; - - public static final String processStatus_FIELDNAME = "processStatus"; - @FieldDescribe("中心工作处理状态：草稿|待审核|待确认|执行中|已完成|已撤消") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + processStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processStatus = "草稿"; - - public static final String deployDateStr_FIELDNAME = "deployDateStr"; - @FieldDescribe("中心工作部署日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + deployDateStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployDateStr = ""; - - public static final String defaultCompleteDateLimit_FIELDNAME = "defaultCompleteDateLimit"; - @FieldDescribe("中心工作默认完成日期") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + defaultCompleteDateLimit_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date defaultCompleteDateLimit = null; - - public static final String defaultCompleteDateLimitStr_FIELDNAME = "defaultCompleteDateLimitStr"; - @FieldDescribe("中心工作默认完成日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + defaultCompleteDateLimitStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String defaultCompleteDateLimitStr = ""; - - public static final String defaultWorkType_FIELDNAME = "defaultWorkType"; - @FieldDescribe("中心工作默认工作类别") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + defaultWorkType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String defaultWorkType = ""; - - public static final String defaultWorkLevel_FIELDNAME = "defaultWorkLevel"; - @FieldDescribe("中心工作默认工作级别") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + defaultWorkLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String defaultWorkLevel = ""; - - public static final String isNeedAudit_FIELDNAME = "isNeedAudit"; - @FieldDescribe("中心工作是否需要审核") - @Column(name = ColumnNamePrefix + isNeedAudit_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isNeedAudit = false; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String status = "正常"; - - public static final String description_FIELDNAME = "description"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("中心工作描述") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = ""; - - public static final String workTotal_FIELDNAME = "workTotal"; - @FieldDescribe("工作总个数") - @Column(name = ColumnNamePrefix + workTotal_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long workTotal = 0L; - - public static final String processingWorkCount_FIELDNAME = "processingWorkCount"; - @FieldDescribe("执行中工作个数") - @Column(name = ColumnNamePrefix + processingWorkCount_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long processingWorkCount = 0L; - - public static final String completedWorkCount_FIELDNAME = "completedWorkCount"; - @FieldDescribe("已完成工作个数") - @Column(name = ColumnNamePrefix + completedWorkCount_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long completedWorkCount = 0L; - - public static final String overtimeWorkCount_FIELDNAME = "overtimeWorkCount"; - @FieldDescribe("已超时工作个数") - @Column(name = ColumnNamePrefix + overtimeWorkCount_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long overtimeWorkCount = 0L; - - public static final String draftWorkCount_FIELDNAME = "draftWorkCount"; - @FieldDescribe("草稿工作个数") - @Column(name = ColumnNamePrefix + draftWorkCount_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long draftWorkCount = 0L; - - public static final String defaultLeaderList_FIELDNAME = "defaultLeaderList"; - @FieldDescribe("中心工作默认阅知领导姓名") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + defaultLeaderList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + defaultLeaderList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + defaultLeaderList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + defaultLeaderList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List defaultLeaderList; - - public static final String defaultLeaderIdentityList_FIELDNAME = "defaultLeaderIdentityList"; - @FieldDescribe("中心工作默认阅知领导身份") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + defaultLeaderIdentityList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + defaultLeaderIdentityList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + defaultLeaderIdentityList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + defaultLeaderIdentityList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List defaultLeaderIdentityList; - - public static final String reportAuditLeaderNameList_FIELDNAME = "reportAuditLeaderNameList"; - @FieldDescribe("工作汇报审批领导(可多值，显示用)") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + reportAuditLeaderNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + reportAuditLeaderNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reportAuditLeaderNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + reportAuditLeaderNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List reportAuditLeaderNameList; - - public static final String reportAuditLeaderIdentityList_FIELDNAME = "reportAuditLeaderIdentityList"; - @FieldDescribe("工作汇报审批领导身份(可多值，计算组织和顶层组织用)") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + reportAuditLeaderIdentityList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + reportAuditLeaderIdentityList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reportAuditLeaderIdentityList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + reportAuditLeaderIdentityList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - - private List reportAuditLeaderIdentityList; - - public static final String reportAuditLeaderUnitNameList_FIELDNAME = "reportAuditLeaderUnitNameList"; - @FieldDescribe("审核者所属组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + reportAuditLeaderUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + reportAuditLeaderUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reportAuditLeaderUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + reportAuditLeaderUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List reportAuditLeaderUnitNameList; - - public static final String reportAuditLeaderTopUnitNameList_FIELDNAME = "reportAuditLeaderTopUnitNameList"; - @FieldDescribe("审核者所属顶层组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + reportAuditLeaderTopUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + reportAuditLeaderTopUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reportAuditLeaderTopUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + reportAuditLeaderTopUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List reportAuditLeaderTopUnitNameList; - - public static final String attachmentList_FIELDNAME = "attachmentList"; - @FieldDescribe("附件列表") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle + attachmentList_FIELDNAME, joinIndex = @Index(name = TABLE - + IndexNameMiddle + attachmentList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + attachmentList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + attachmentList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List attachmentList; - - /** - * 获取中心工作标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置中心工作标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取部署者姓名 - * - * @return - */ - public String getDeployerName() { - return deployerName; - } - - /** - * 设置部署者姓名 - * - * @param deployerName - */ - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - /** - * 获取部署者所属组织名称 - * - * @return - */ - public String getDeployerUnitName() { - return deployerUnitName; - } - - /** - * 设置部署者所属组织名称 - * - * @param deployerUnitName - */ - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - /** - * 获取部署者所属顶层组织名称 - * - * @return - */ - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - /** - * 设置部署者所属顶层组织名称 - * - * @param deployerTopUnitName - */ - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - /** - * 获取创建者姓名 - * - * @return - */ - public String getCreatorName() { - return creatorName; - } - - /** - * 设置创建者姓名 - * - * @param creatorName - */ - public void setCreatorName(String creatorName) { - this.creatorName = creatorName; - } - - /** - * 获取创建者所属组织名称 - * - * @return - */ - public String getCreatorUnitName() { - return creatorUnitName; - } - - /** - * 设置创建者所属组织名称 - * - * @param creatorUnitName - */ - public void setCreatorUnitName(String creatorUnitName) { - this.creatorUnitName = creatorUnitName; - } - - /** - * 获取创建者所属顶层组织名称 - * - * @return - */ - public String getCreatorTopUnitName() { - return creatorTopUnitName; - } - - /** - * 设置创建者所属顶层组织名称 - * - * @param creatorTopUnitName - */ - public void setCreatorTopUnitName(String creatorTopUnitName) { - this.creatorTopUnitName = creatorTopUnitName; - } - - /** - * 获取中心工作信息处理状态：草稿|待确认|执行中|已完成|已撤消 - * - * @return - */ - public String getProcessStatus() { - return processStatus; - } - - /** - * 设置中心工作信息处理状态：草稿|待确认|执行中|已完成|已撤消 - * - * @param processStatus - */ - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - /** - * 获取中心工作下属工作默认完成日期 - * - * @return - */ - public Date getDefaultCompleteDateLimit() { - return defaultCompleteDateLimit; - } - - /** - * 设置中心工作下属工作默认完成日期 - * - * @param defaultCompleteDateLimit - */ - public void setDefaultCompleteDateLimit(Date defaultCompleteDateLimit) { - this.defaultCompleteDateLimit = defaultCompleteDateLimit; - } - - /** - * 获取中心工作下属工作默认完成日期（字符串） - * - * @return - */ - public String getDefaultCompleteDateLimitStr() { - return defaultCompleteDateLimitStr; - } - - /** - * 设置中心工作下属工作默认完成日期（字符串） - * - * @param defaultCompleteDateLimitStr - */ - public void setDefaultCompleteDateLimitStr(String defaultCompleteDateLimitStr) { - this.defaultCompleteDateLimitStr = defaultCompleteDateLimitStr; - } - - /** - * 获取中心工作下属工作默认工作类别 - * - * @return - */ - public String getDefaultWorkType() { - return defaultWorkType; - } - - /** - * 设置中心工作下属工作默认工作类别 - * - * @param defaultWorkType - */ - public void setDefaultWorkType(String defaultWorkType) { - this.defaultWorkType = defaultWorkType; - } - - /** - * 获取中心工作下属工作默认工作级别 - * - * @return - */ - public String getDefaultWorkLevel() { - return defaultWorkLevel; - } - - /** - * 设置中心工作下属工作默认工作级别 - * - * @param defaultWorkLevel - */ - public void setDefaultWorkLevel(String defaultWorkLevel) { - this.defaultWorkLevel = defaultWorkLevel; - } - - /** - * 获取工作部署年份 - * - * @return - */ - public String getDeployYear() { - return deployYear; - } - - /** - * 设置工作部署年份 - * - * @param deployYear - */ - public void setDeployYear(String deployYear) { - this.deployYear = deployYear; - } - - /** - * 获取工作部署月份 - * - * @return - */ - public String getDeployMonth() { - return deployMonth; - } - - /** - * 设置工作部署月份 - * - * @param deployMonth - */ - public void setDeployMonth(String deployMonth) { - this.deployMonth = deployMonth; - } - - /** - * 获取是否需要审核 - * - * @return - */ - public Boolean getIsNeedAudit() { - return isNeedAudit; - } - - /** - * 设置是否需要审核 - * - * @param isNeedAudit - */ - public void setIsNeedAudit(Boolean isNeedAudit) { - this.isNeedAudit = isNeedAudit; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取中心工作描述 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置中心工作描述 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getCreatorIdentity() { - return creatorIdentity; - } - - public void setCreatorIdentity(String creatorIdentity) { - this.creatorIdentity = creatorIdentity; - } - - public Long getWorkTotal() { - return workTotal; - } - - public void setWorkTotal(Long workTotal) { - this.workTotal = workTotal; - } - - public Long getProcessingWorkCount() { - return processingWorkCount; - } - - public void setProcessingWorkCount(Long processingWorkCount) { - this.processingWorkCount = processingWorkCount; - } - - public Long getCompletedWorkCount() { - return completedWorkCount; - } - - public void setCompletedWorkCount(Long completedWorkCount) { - this.completedWorkCount = completedWorkCount; - } - - public Long getOvertimeWorkCount() { - return overtimeWorkCount; - } - - public void setOvertimeWorkCount(Long overtimeWorkCount) { - this.overtimeWorkCount = overtimeWorkCount; - } - - public Long getDraftWorkCount() { - return draftWorkCount; - } - - public void setDraftWorkCount(Long draftWorkCount) { - this.draftWorkCount = draftWorkCount; - } - - public List getAttachmentList() { - return attachmentList; - } - - public void setAttachmentList(List attachmentList) { - this.attachmentList = attachmentList; - } - - public String getDeployDateStr() { - return deployDateStr; - } - - public void setDeployDateStr(String deployDateStr) { - this.deployDateStr = deployDateStr; - } - - public List getDefaultLeaderList() { - return defaultLeaderList == null ? new ArrayList<>() : defaultLeaderList; - } - - public List getDefaultLeaderIdentityList() { - return defaultLeaderIdentityList == null ? new ArrayList<>() : defaultLeaderIdentityList; - } - - public List getReportAuditLeaderNameList() { - return reportAuditLeaderNameList == null ? new ArrayList<>() : reportAuditLeaderNameList; - } - - public List getReportAuditLeaderIdentityList() { - return reportAuditLeaderIdentityList == null ? new ArrayList<>() : reportAuditLeaderIdentityList; - } - - public void setDefaultLeaderList(List defaultLeaderList) { - this.defaultLeaderList = defaultLeaderList; - } - - public void setDefaultLeaderIdentityList(List defaultLeaderIdentityList) { - this.defaultLeaderIdentityList = defaultLeaderIdentityList; - } - - public void setReportAuditLeaderNameList(List reportAuditLeaderNameList) { - this.reportAuditLeaderNameList = reportAuditLeaderNameList; - } - - public void setReportAuditLeaderIdentityList(List reportAuditLeaderIdentityList) { - this.reportAuditLeaderIdentityList = reportAuditLeaderIdentityList; - } - - public List getReportAuditLeaderUnitNameList() { - return reportAuditLeaderUnitNameList == null ? new ArrayList<>() : reportAuditLeaderUnitNameList; - } - - public List getReportAuditLeaderTopUnitNameList() { - return reportAuditLeaderTopUnitNameList == null ? new ArrayList<>() : reportAuditLeaderTopUnitNameList; - } - - public void setReportAuditLeaderUnitNameList(List reportAuditLeaderUnitNameList) { - this.reportAuditLeaderUnitNameList = reportAuditLeaderUnitNameList; - } - - public void setReportAuditLeaderTopUnitNameList(List reportAuditLeaderTopUnitNameList) { - this.reportAuditLeaderTopUnitNameList = reportAuditLeaderTopUnitNameList; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSecretary.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSecretary.java deleted file mode 100644 index 38aac0da07..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSecretary.java +++ /dev/null @@ -1,282 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 领导秘书配置信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrConfigSecretary.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrConfigSecretary.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrConfigSecretary extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrConfigSecretary.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String secretaryName_FIELDNAME = "secretaryName"; - @FieldDescribe("秘书姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + secretaryName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + secretaryName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String secretaryName = ""; - - public static final String secretaryIdentity_FIELDNAME = "secretaryIdentity"; - @FieldDescribe("秘书身份名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + secretaryIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + secretaryIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String secretaryIdentity = ""; - - public static final String secretaryUnitName_FIELDNAME = "secretaryUnitName"; - @FieldDescribe("秘书所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + secretaryUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String secretaryUnitName = ""; - - public static final String secretaryTopUnitName_FIELDNAME = "secretaryTopUnitName"; - @FieldDescribe("秘书所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + secretaryTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String secretaryTopUnitName = ""; - - public static final String leaderName_FIELDNAME = "leaderName"; - @FieldDescribe("领导姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + leaderName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String leaderName = ""; - - public static final String leaderIdentity_FIELDNAME = "leaderIdentity"; - @FieldDescribe("领导身份名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + leaderIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + leaderIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String leaderIdentity = ""; - - public static final String leaderUnitName_FIELDNAME = "leaderUnitName"; - @FieldDescribe("领导所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + leaderUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String leaderUnitName = ""; - - public static final String leaderTopUnitName_FIELDNAME = "leaderTopUnitName"; - @FieldDescribe("领导所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + leaderTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String leaderTopUnitName = ""; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - /** - * 获取秘书姓名 - * - * @return - */ - public String getSecretaryName() { - return secretaryName; - } - - /** - * 设置秘书姓名 - * - * @param secretaryName - */ - public void setSecretaryName(String secretaryName) { - this.secretaryName = secretaryName; - } - - /** - * 获取秘书所属组织名称 - * - * @return - */ - public String getSecretaryUnitName() { - return secretaryUnitName; - } - - /** - * 设置秘书所属组织名称 - * - * @param secretaryUnitName - */ - public void setSecretaryUnitName(String secretaryUnitName) { - this.secretaryUnitName = secretaryUnitName; - } - - /** - * 获取秘书所属顶层组织名称 - * - * @return - */ - public String getSecretaryTopUnitName() { - return secretaryTopUnitName; - } - - /** - * 设置秘书所属顶层组织名称 - * - * @param secretaryTopUnitName - */ - public void setSecretaryTopUnitName(String secretaryTopUnitName) { - this.secretaryTopUnitName = secretaryTopUnitName; - } - - /** - * 获取领导姓名 - * - * @return - */ - public String getLeaderName() { - return leaderName; - } - - /** - * 设置领导姓名 - * - * @param leaderName - */ - public void setLeaderName(String leaderName) { - this.leaderName = leaderName; - } - - /** - * 获取领导所属组织名称 - * - * @return - */ - public String getLeaderUnitName() { - return leaderUnitName; - } - - /** - * 设置领导所属组织名称 - * - * @param leaderUnitName - */ - public void setLeaderUnitName(String leaderUnitName) { - this.leaderUnitName = leaderUnitName; - } - - /** - * 获取领导所属顶层组织名称 - * - * @return - */ - public String getLeaderTopUnitName() { - return leaderTopUnitName; - } - - /** - * 设置领导所属顶层组织名称 - * - * @param leaderTopUnitName - */ - public void setLeaderTopUnitName(String leaderTopUnitName) { - this.leaderTopUnitName = leaderTopUnitName; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置备注说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * 获取领导的身份 - * - * @return - */ - public String getLeaderIdentity() { - return leaderIdentity; - } - - /** - * 设置领导的身份 - * - * @param leaderIdentity - */ - public void setLeaderIdentity(String leaderIdentity) { - this.leaderIdentity = leaderIdentity; - } - - public String getSecretaryIdentity() { - return secretaryIdentity; - } - - public void setSecretaryIdentity(String secretaryIdentity) { - this.secretaryIdentity = secretaryIdentity; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSystem.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSystem.java deleted file mode 100644 index e07790f9cd..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigSystem.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 系统配置信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrConfigSystem.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrConfigSystem.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrConfigSystem extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrConfigSystem.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String configName_FIELDNAME = "configName"; - @FieldDescribe("系统配置名称") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + configName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String configName = null; - - public static final String configCode_FIELDNAME = "configCode"; - @FieldDescribe("系统配置编码") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + configCode_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + configCode_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String configCode = null; - - public static final String configValue_FIELDNAME = "configValue"; - @FieldDescribe("配置值") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + configValue_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String configValue = null; - - public static final String valueType_FIELDNAME = "valueType"; - @FieldDescribe("值类型: select | identity | number | date | text") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + valueType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String valueType = null; - - public static final String selectContent_FIELDNAME = "selectContent"; - @FieldDescribe("可选值，和select配合使用，以‘|’号分隔") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + selectContent_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String selectContent = "--无--"; - - public static final String isMultiple_FIELDNAME = "isMultiple"; - @FieldDescribe("是否可以多值") - @Column(name = ColumnNamePrefix + isMultiple_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isMultiple = false; - - public static final String orderNumber_FIELDNAME = "orderNumber"; - @FieldDescribe("排序号") - @Column(name = ColumnNamePrefix + orderNumber_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer orderNumber = 1; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - /** - * 获取配置名称 - * - * @return - */ - public String getConfigName() { - return configName; - } - - /** - * 设置配置名称 - * - * @param configName - */ - public void setConfigName(String configName) { - this.configName = configName; - } - - /** - * 获取配置编码 - * - * @return - */ - public String getConfigCode() { - return configCode; - } - - /** - * 设置配置编码 - * - * @param configCode - */ - public void setConfigCode(String configCode) { - this.configCode = configCode; - } - - /** - * 获取配置值 - * - * @return - */ - public String getConfigValue() { - return configValue; - } - - /** - * 设置配置值 - * - * @param configValue - */ - public void setConfigValue(String configValue) { - this.configValue = configValue; - } - - /** - * 获取排序号 - * - * @return - */ - public Integer getOrderNumber() { - return orderNumber; - } - - /** - * 设置排序号 - * - * @param orderNumber - */ - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置备注说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - public String getValueType() { - return valueType; - } - - public void setValueType(String valueType) { - this.valueType = valueType; - } - - public String getSelectContent() { - return selectContent; - } - - public void setSelectContent(String selectContent) { - this.selectContent = selectContent; - } - - public Boolean getIsMultiple() { - return isMultiple; - } - - public void setIsMultiple(Boolean isMultiple) { - this.isMultiple = isMultiple; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkLevel.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkLevel.java deleted file mode 100644 index 0acea01b58..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkLevel.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作级别配置信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrConfigWorkLevel.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrConfigWorkLevel.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrConfigWorkLevel extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrConfigWorkLevel.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String workLevelName_FIELDNAME = "workLevelName"; - @FieldDescribe("工作级别名称") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workLevelName_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workLevelName = null; - - public static final String orderNumber_FIELDNAME = "orderNumber"; - @FieldDescribe("排序号") - @Column(name = ColumnNamePrefix + orderNumber_FIELDNAME) - @CheckPersist(allowEmpty = false) - private Integer orderNumber = 1; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - /** - * 获取工作级别名称 - * - * @return - */ - public String getWorkLevelName() { - return workLevelName; - } - - /** - * 设置工作级别名称 - * - * @param workLevelName - */ - public void setWorkLevelName(String workLevelName) { - this.workLevelName = workLevelName; - } - - /** - * 获取排序号 - * - * @return - */ - public Integer getOrderNumber() { - return orderNumber; - } - - /** - * 设置排序号 - * - * @param orderNumber - */ - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置备注说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkType.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkType.java deleted file mode 100644 index a02bd14386..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrConfigWorkType.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作类别配置信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrConfigWorkType.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrConfigWorkType.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrConfigWorkType extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrConfigWorkType.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String workTypeName_FIELDNAME = "workTypeName"; - @FieldDescribe("工作类别别名称") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workTypeName_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workTypeName = null; - - public static final String orderNumber_FIELDNAME = "orderNumber"; - @FieldDescribe("排序号") - @Column(name = ColumnNamePrefix + orderNumber_FIELDNAME) - @CheckPersist(allowEmpty = false) - private Integer orderNumber = 1; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - /** - * 获取工作类别名称 - * - * @return - */ - public String getWorkTypeName() { - return workTypeName; - } - - /** - * 设置工作类别名称 - * - * @param workLevelName - */ - public void setWorkTypeName(String workTypeName) { - this.workTypeName = workTypeName; - } - - /** - * 获取排序号 - * - * @return - */ - public Integer getOrderNumber() { - return orderNumber; - } - - /** - * 设置排序号 - * - * @param orderNumber - */ - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置备注说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorIdentityRecords.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorIdentityRecords.java deleted file mode 100644 index 034589198b..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorIdentityRecords.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 系统问题身份涉及记录详细信息实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrErrorIdentityRecords.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrErrorIdentityRecords.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrErrorIdentityRecords extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrErrorIdentityRecords.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - - public static final String identity_FIELDNAME = "identity"; - @FieldDescribe("身份名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + identity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + identity_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String identity = "未知"; - - public static final String recordsJson_FIELDNAME = "recordsJson"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("涉及到的所有记录JSON") - @Column(length = JpaObject.length_10M, name = ColumnNamePrefix + recordsJson_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String recordsJson = ""; - - public static final String flag_FIELDNAME = "flag"; - @FieldDescribe("更新标识") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix + flag_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + flag_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String flag = "未知"; - - public String getIdentity() { - return identity; - } - - public String getRecordsJson() { - return recordsJson; - } - - public String getFlag() { - return flag; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - - public void setRecordsJson(String recordsJson) { - this.recordsJson = recordsJson; - } - - public void setFlag(String flag) { - this.flag = flag; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorSystemIdentityInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorSystemIdentityInfo.java deleted file mode 100644 index 3b30af4355..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrErrorSystemIdentityInfo.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 系统问题身份记录信息实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrErrorSystemIdentityInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrErrorSystemIdentityInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrErrorSystemIdentityInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrErrorSystemIdentityInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String identity_FIELDNAME = "identity"; - @FieldDescribe("身份名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + identity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + identity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String identity = "未知"; - - public static final String flag_FIELDNAME = "flag"; - @FieldDescribe("更新标识") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix + flag_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String flag = "未知"; - - public String getIdentity() { - return identity; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - - public String getFlag() { - return flag; - } - - public void setFlag(String flag) { - this.flag = flag; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportContent.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportContent.java deleted file mode 100644 index 2c52aa0182..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportContent.java +++ /dev/null @@ -1,510 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 中心工作汇报情况统计信息实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrStatisticReportContent.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrStatisticReportContent.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrStatisticReportContent extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrStatisticReportContent.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerTitle = ""; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String parentId_FIELDNAME = "parentId"; - @FieldDescribe("上级工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + parentId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String parentId = null; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workTitle = ""; - - public static final String reportId_FIELDNAME = "reportId"; - @FieldDescribe("工作汇报ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + reportId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportId = ""; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String workLevel_FIELDNAME = "workLevel"; - @FieldDescribe("工作级别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workLevel = ""; - - public static final String cycleType_FIELDNAME = "cycleType"; - @FieldDescribe("统计周期：每周统计|每月统计") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + cycleType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String cycleType = ""; - - public static final String statisticTime_FIELDNAME = "statisticTime"; - @FieldDescribe("统计时间.") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + statisticTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date statisticTime = null; - - public static final String statisticTimeFlag_FIELDNAME = "statisticTimeFlag"; - @FieldDescribe("统计时间标识.") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + statisticTimeFlag_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String statisticTimeFlag = null; - - public static final String statisticYear_FIELDNAME = "statisticYear"; - @FieldDescribe("统计年份") - @Column(name = ColumnNamePrefix + statisticYear_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer statisticYear = null; - - public static final String statisticMonth_FIELDNAME = "statisticMonth"; - @FieldDescribe("统计月份") - @Column(name = ColumnNamePrefix + statisticMonth_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer statisticMonth = null; - - public static final String statisticWeek_FIELDNAME = "statisticWeek"; - @FieldDescribe("统计周数") - @Column(name = ColumnNamePrefix + statisticWeek_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer statisticWeek = null; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - public static final String responsibilityEmployeeName_FIELDNAME = "responsibilityEmployeeName"; - @FieldDescribe("主责人姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityEmployeeName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityEmployeeName = ""; - - public static final String responsibilityIdentity_FIELDNAME = "responsibilityIdentity"; - @FieldDescribe("主责人身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityIdentity = ""; - - public static final String responsibilityUnitName_FIELDNAME = "responsibilityUnitName"; - @FieldDescribe("主责人所属组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityUnitName = ""; - - public static final String responsibilityTopUnitName_FIELDNAME = "responsibilityTopUnitName"; - @FieldDescribe("主责人所属顶层组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityTopUnitName = ""; - - public static final String isCompleted_FIELDNAME = "isCompleted"; - @FieldDescribe("工作是否已完成") - @Column(name = ColumnNamePrefix + isCompleted_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isCompleted = false; - - public static final String isOverTime_FIELDNAME = "isOverTime"; - @FieldDescribe("工作是否已超期") - @Column(name = ColumnNamePrefix + isOverTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isOverTime = false; - - public static final String workProcessStatus_FIELDNAME = "workProcessStatus"; - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workProcessStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workProcessStatus = "草稿"; - - public static final String reportStatus_FIELDNAME = "reportStatus"; - @FieldDescribe("工作汇报状态") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + reportStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportStatus = "未提交汇报"; - - public static final String reportDayInCycle_FIELDNAME = "reportDayInCycle"; - @FieldDescribe("周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00") - @Column(name = ColumnNamePrefix + reportDayInCycle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer reportDayInCycle = 0; - - public static final String progressDescription_FIELDNAME = "progressDescription"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("截止当前完成情况") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + progressDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String progressDescription = ""; - - public static final String workPlan_FIELDNAME = "workPlan"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("后续工作计划") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + workPlan_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workPlan = ""; - - public static final String memo_FIELDNAME = "memo"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("工作汇报备注信息") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + memo_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String memo = ""; - - public static final String workPointAndRequirements_FIELDNAME = "workPointAndRequirements"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("工作要点及需求") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + workPointAndRequirements_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workPointAndRequirements = ""; - - public static final String adminSuperviseInfo_FIELDNAME = "adminSuperviseInfo"; - @Lob - @FieldDescribe("管理员督办信息") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + adminSuperviseInfo_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String adminSuperviseInfo = ""; - - public static final String opinion_FIELDNAME = "opinion"; - @Lob - @FieldDescribe("领导处理意见") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + opinion_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String opinion = ""; - - public String getCenterId() { - return centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public String getWorkId() { - return workId; - } - - public String getWorkTitle() { - return workTitle; - } - - public String getReportId() { - return reportId; - } - - public String getWorkType() { - return workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public String getCycleType() { - return cycleType; - } - - public Date getStatisticTime() { - return statisticTime; - } - - public String getStatus() { - return status; - } - - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - public Boolean getIsCompleted() { - return isCompleted; - } - - public Boolean getIsOverTime() { - return isOverTime; - } - - public String getWorkProcessStatus() { - return workProcessStatus; - } - - public Integer getReportDayInCycle() { - return reportDayInCycle; - } - - public String getProgressDescription() { - return progressDescription; - } - - public String getWorkPlan() { - return workPlan; - } - - public String getMemo() { - return memo; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public void setReportId(String reportId) { - this.reportId = reportId; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public void setCycleType(String cycleType) { - this.cycleType = cycleType; - } - - public void setStatisticTime(Date statisticTime) { - this.statisticTime = statisticTime; - } - - public void setStatus(String status) { - this.status = status; - } - - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - public void setReportDayInCycle(Integer reportDayInCycle) { - this.reportDayInCycle = reportDayInCycle; - } - - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } - - public String getOpinion() { - return opinion; - } - - public void setOpinion(String opinion) { - this.opinion = opinion; - } - - public Integer getStatisticYear() { - return statisticYear; - } - - public Integer getStatisticMonth() { - return statisticMonth; - } - - public Integer getStatisticWeek() { - return statisticWeek; - } - - public void setStatisticYear(Integer statisticYear) { - this.statisticYear = statisticYear; - } - - public void setStatisticMonth(Integer statisticMonth) { - this.statisticMonth = statisticMonth; - } - - public void setStatisticWeek(Integer statisticWeek) { - this.statisticWeek = statisticWeek; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getReportStatus() { - return reportStatus; - } - - public void setReportStatus(String reportStatus) { - this.reportStatus = reportStatus; - } - - public String getStatisticTimeFlag() { - return statisticTimeFlag; - } - - public void setStatisticTimeFlag(String statisticTimeFlag) { - this.statisticTimeFlag = statisticTimeFlag; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportStatus.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportStatus.java deleted file mode 100644 index d0c5081f5c..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrStatisticReportStatus.java +++ /dev/null @@ -1,386 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 中心工作汇报情况统计信息实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrStatisticReportStatus.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrStatisticReportStatus.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrStatisticReportStatus extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrStatisticReportStatus.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workTitle = ""; - - public static final String statisticYear_FIELDNAME = "statisticYear"; - @FieldDescribe("统计年份") - @Column(name = ColumnNamePrefix + statisticYear_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + statisticYear_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer statisticYear = 2018; - - public static final String statisticTimeFlag_FIELDNAME = "statisticTimeFlag"; - @FieldDescribe("统计时间标识.") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + statisticTimeFlag_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + statisticTimeFlag_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String statisticTimeFlag = null; - - public static final String reportStatistic_FIELDNAME = "reportStatistic"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("中心工作汇报统计内容") - @Column(length = JpaObject.length_10M, name = ColumnNamePrefix + reportStatistic_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportStatistic = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerTitle = ""; - - public static final String parentId_FIELDNAME = "parentId"; - @FieldDescribe("上级工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + parentId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String parentId = null; - - public static final String responsibilityEmployeeName_FIELDNAME = "responsibilityEmployeeName"; - @FieldDescribe("主责人姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityEmployeeName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityEmployeeName = ""; - - public static final String responsibilityIdentity_FIELDNAME = "responsibilityIdentity"; - @FieldDescribe("主责人身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityIdentity = ""; - - public static final String responsibilityUnitName_FIELDNAME = "responsibilityUnitName"; - @FieldDescribe("主责人所属组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityUnitName = ""; - - public static final String responsibilityTopUnitName_FIELDNAME = "responsibilityTopUnitName"; - @FieldDescribe("主责人所属顶层组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityTopUnitName = ""; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String workLevel_FIELDNAME = "workLevel"; - @FieldDescribe("工作级别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workLevel = ""; - - public static final String overallProgress_FIELDNAME = "overallProgress"; - @FieldDescribe("工作进度") - @Column(name = ColumnNamePrefix + overallProgress_FIELDNAME) - private Integer overallProgress = 0; - - public static final String reportCycle_FIELDNAME = "reportCycle"; - @FieldDescribe("汇报周期:不需要汇报|每月汇报|每周汇报") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + reportCycle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportCycle = null; - - public static final String reportDayInCycle_FIELDNAME = "reportDayInCycle"; - @FieldDescribe("周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00") - @Column(name = ColumnNamePrefix + reportDayInCycle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer reportDayInCycle = 0; - - public static final String workDateTimeType_FIELDNAME = "workDateTimeType"; - @FieldDescribe("工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报）") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workDateTimeType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workDateTimeType = "长期工作"; - - public static final String workProcessStatus_FIELDNAME = "workProcessStatus"; - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workProcessStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workProcessStatus = "草稿"; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("工作处理状态：正常|已归档") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - public static final String deployDateStr_FIELDNAME = "deployDateStr"; - @FieldDescribe("工作部署日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + deployDateStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployDateStr = ""; - - public static final String completeDateLimitStr_FIELDNAME = "completeDateLimitStr"; - @FieldDescribe("工作完成日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + completeDateLimitStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String completeDateLimitStr = ""; - - public String getCenterId() { - return centerId; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getWorkTitle() { - return workTitle; - } - - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public String getWorkLevel() { - return workLevel; - } - - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - public Integer getOverallProgress() { - return overallProgress; - } - - public void setOverallProgress(Integer overallProgress) { - this.overallProgress = overallProgress; - } - - public String getWorkProcessStatus() { - return workProcessStatus; - } - - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - public String getReportStatistic() { - return reportStatistic; - } - - public void setReportStatistic(String reportStatistic) { - this.reportStatistic = reportStatistic; - } - - public String getReportCycle() { - return reportCycle; - } - - public void setReportCycle(String reportCycle) { - this.reportCycle = reportCycle; - } - - public Integer getReportDayInCycle() { - return reportDayInCycle; - } - - public void setReportDayInCycle(Integer reportDayInCycle) { - this.reportDayInCycle = reportDayInCycle; - } - - public String getWorkDateTimeType() { - return workDateTimeType; - } - - public void setWorkDateTimeType(String workDateTimeType) { - this.workDateTimeType = workDateTimeType; - } - - public Integer getStatisticYear() { - return statisticYear; - } - - public void setStatisticYear(Integer statisticYear) { - this.statisticYear = statisticYear; - } - - public String getDeployDateStr() { - return deployDateStr; - } - - public void setDeployDateStr(String deployDateStr) { - this.deployDateStr = deployDateStr; - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getStatisticTimeFlag() { - return statisticTimeFlag; - } - - public void setStatisticTimeFlag(String statisticTimeFlag) { - this.statisticTimeFlag = statisticTimeFlag; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTask.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTask.java deleted file mode 100644 index 9ab089d2d4..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTask.java +++ /dev/null @@ -1,528 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 系统待办信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrTask.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrTask.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrTask extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrTask.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String title_FIELDNAME = "title"; - @FieldDescribe("待办标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String title = ""; - - public static final String processType_FIELDNAME = "processType"; - @FieldDescribe("办理类别: TASK|READ") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + processType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + processType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processType = "TASK"; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = null; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = null; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + "_workId") - @CheckPersist(allowEmpty = true) - private String workId = null; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workTitle = null; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String dynamicObjectType_FIELDNAME = "dynamicObjectType"; - @FieldDescribe("动态对象类别:中心工作|工作|工作汇报|问题请示|交流") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + dynamicObjectType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + dynamicObjectType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectType = null; - - public static final String dynamicObjectId_FIELDNAME = "dynamicObjectId"; - @FieldDescribe("动态对象ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + dynamicObjectId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + dynamicObjectId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectId = null; - - public static final String dynamicObjectTitle_FIELDNAME = "dynamicObjectTitle"; - @FieldDescribe("动态对象标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + dynamicObjectTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectTitle = ""; - - public static final String arriveDateTimeStr_FIELDNAME = "arriveDateTimeStr"; - @FieldDescribe("到达时间字符串") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + arriveDateTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String arriveDateTimeStr = null; - - public static final String arriveDateTime_FIELDNAME = "arriveDateTime"; - @FieldDescribe("到达时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + arriveDateTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date arriveDateTime = null; - - public static final String targetName_FIELDNAME = "targetName"; - @FieldDescribe("目标者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetName = null; - - public static final String targetIdentity_FIELDNAME = "targetIdentity"; - @FieldDescribe("目标者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + targetIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetIdentity = null; - - public static final String targetUnitName_FIELDNAME = "targetUnitName"; - @FieldDescribe("目标者所属组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetUnitName = null; - - public static final String targetTopUnitName_FIELDNAME = "targetTopUnitName"; - @FieldDescribe("目标者所属顶层组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetTopUnitName = null; - - public static final String activityName_FIELDNAME = "activityName"; - @FieldDescribe("处理环节名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + activityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String activityName = ""; - - public static final String viewUrl_FIELDNAME = "viewUrl"; - @FieldDescribe("访问链接") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + viewUrl_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String viewUrl = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - /** - * 获取动态对象类别:中心工作|工作|工作汇报|问题请示|交流 - * - * @return - */ - public String getDynamicObjectType() { - return dynamicObjectType; - } - - /** - * 设置动态对象类别:中心工作|工作|工作汇报|问题请示|交流 - * - * @param dynamicObjectType - */ - public void setDynamicObjectType(String dynamicObjectType) { - this.dynamicObjectType = dynamicObjectType; - } - - /** - * 获取动态对象ID - * - * @return - */ - public String getDynamicObjectId() { - return dynamicObjectId; - } - - /** - * 设置动态对象ID - * - * @param dynamicObjectId - */ - public void setDynamicObjectId(String dynamicObjectId) { - this.dynamicObjectId = dynamicObjectId; - } - - /** - * 获取动态对象标题 - * - * @return - */ - public String getDynamicObjectTitle() { - return dynamicObjectTitle; - } - - /** - * 设置动态对象标题 - * - * @param dynamicObjectTitle - */ - public void setDynamicObjectTitle(String dynamicObjectTitle) { - this.dynamicObjectTitle = dynamicObjectTitle; - } - - /** - * 获取目标对象名称 - * - * @return - */ - public String getTargetName() { - return targetName; - } - - /** - * 设置目标对象名称 - * - * @param targetName - */ - public void setTargetName(String targetName) { - this.targetName = targetName; - } - - /** - * 获取目标访问URL - * - * @return - */ - public String getViewUrl() { - return viewUrl; - } - - /** - * 设置目标访问URL - * - * @param viewUrl - */ - public void setViewUrl(String viewUrl) { - this.viewUrl = viewUrl; - } - - /** - * 获取待办标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置待办标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getWorkTitle() { - return workTitle; - } - - /** - * 设置工作标题 - * - * @param workTitle - */ - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - /** - * 获取待办到达时间 - * - * @return - */ - public String getArriveDateTimeStr() { - return arriveDateTimeStr; - } - - /** - * 设置待办到达时间 - * - * @param arriveDateTimeStr - */ - public void setArriveDateTimeStr(String arriveDateTimeStr) { - this.arriveDateTimeStr = arriveDateTimeStr; - } - - /** - * 获取待办到达时间 - * - * @return - */ - public Date getArriveDateTime() { - return arriveDateTime; - } - - /** - * 设置待办到达时间 - * - * @param arriveDateTime - */ - public void setArriveDateTime(Date arriveDateTime) { - this.arriveDateTime = arriveDateTime; - } - - /** - * 获取办理人所属组织名称 - * - * @return - */ - public String getTargetUnitName() { - return targetUnitName; - } - - /** - * 设置办理人所属组织名称 - * - * @param targetUnitName - */ - public void setTargetUnitName(String targetUnitName) { - this.targetUnitName = targetUnitName; - } - - /** - * 获取办理人所属顶层组织名称 - * - * @return - */ - public String getTargetTopUnitName() { - return targetTopUnitName; - } - - /** - * 设置办理人所属顶层组织名称 - * - * @param targetTopUnitName - */ - public void setTargetTopUnitName(String targetTopUnitName) { - this.targetTopUnitName = targetTopUnitName; - } - - /** - * 获取办理环节名称 - * - * @return - */ - public String getActivityName() { - return activityName; - } - - /** - * 设置办理环节名称 - * - * @param activityName - */ - public void setActivityName(String activityName) { - this.activityName = activityName; - } - - /** - * 获取办理类别：TASK|READ - * - * @return - */ - public String getProcessType() { - return processType; - } - - /** - * 设置办理类别：TASK|READ - * - * @param processType - */ - public void setProcessType(String processType) { - this.processType = processType; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取目标用户身份 - * - * @return - */ - public String getTargetIdentity() { - return targetIdentity; - } - - /** - * 设置目标用户身份 - * - * @param targetIdentity - */ - public void setTargetIdentity(String targetIdentity) { - this.targetIdentity = targetIdentity; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTaskHandled.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTaskHandled.java deleted file mode 100644 index db403d59e3..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrTaskHandled.java +++ /dev/null @@ -1,599 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 系统待办信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrTaskHandled.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrTaskHandled.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrTaskHandled extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrTaskHandled.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String title_FIELDNAME = "title"; - @FieldDescribe("待办标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String title = ""; - - public static final String processType_FIELDNAME = "processType"; - @FieldDescribe("办理类别: TASK|READ") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + processType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + processType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processType = "TASK"; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = null; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = null; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = null; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workTitle = null; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String dynamicObjectType_FIELDNAME = "dynamicObjectType"; - @FieldDescribe("动态对象类别:中心工作|工作|工作汇报|问题请示|交流") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + dynamicObjectType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectType = null; - - public static final String dynamicObjectId_FIELDNAME = "dynamicObjectId"; - @FieldDescribe("动态对象ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + dynamicObjectId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectId = null; - - public static final String dynamicObjectTitle_FIELDNAME = "dynamicObjectTitle"; - @FieldDescribe("动态对象标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + dynamicObjectTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectTitle = ""; - - public static final String arriveDateTimeStr_FIELDNAME = "arriveDateTimeStr"; - @FieldDescribe("到达时间") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + arriveDateTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String arriveDateTimeStr = null; - - public static final String arriveDateTime_FIELDNAME = "arriveDateTime"; - @FieldDescribe("到达时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + arriveDateTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date arriveDateTime = null; - - public static final String targetName_FIELDNAME = "targetName"; - @FieldDescribe("目标者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + targetName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetName = null; - - public static final String targetIdentity_FIELDNAME = "targetIdentity"; - @FieldDescribe("目标者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + targetIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetIdentity = null; - - public static final String targetUnitName_FIELDNAME = "targetUnitName"; - @FieldDescribe("目标者所属组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetUnitName = null; - - public static final String targetTopUnitName_FIELDNAME = "targetTopUnitName"; - @FieldDescribe("目标者所属顶层组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetTopUnitName = null; - - public static final String processDateTimeStr_FIELDNAME = "processDateTimeStr"; - @FieldDescribe("办理时间字符串") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + processDateTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processDateTimeStr = null; - - public static final String processDateTime_FIELDNAME = "processDateTime"; - @FieldDescribe("办理时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + processDateTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date processDateTime = null; - - public static final String activityName_FIELDNAME = "activityName"; - @FieldDescribe("处理环节名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + activityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String activityName = ""; - - public static final String viewUrl_FIELDNAME = "viewUrl"; - @FieldDescribe("访问链接") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + viewUrl_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String viewUrl = ""; - - public static final String duration_FIELDNAME = "duration"; - @FieldDescribe("办理时长") - @Column(name = ColumnNamePrefix + duration_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long duration = 0L; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - /** - * 获取动态对象类别:中心工作|工作|工作汇报|问题请示|交流 - * - * @return - */ - public String getDynamicObjectType() { - return dynamicObjectType; - } - - /** - * 设置动态对象类别:中心工作|工作|工作汇报|问题请示|交流 - * - * @param dynamicObjectType - */ - public void setDynamicObjectType(String dynamicObjectType) { - this.dynamicObjectType = dynamicObjectType; - } - - /** - * 获取动态对象ID - * - * @return - */ - public String getDynamicObjectId() { - return dynamicObjectId; - } - - /** - * 设置动态对象ID - * - * @param dynamicObjectId - */ - public void setDynamicObjectId(String dynamicObjectId) { - this.dynamicObjectId = dynamicObjectId; - } - - /** - * 获取动态对象标题 - * - * @return - */ - public String getDynamicObjectTitle() { - return dynamicObjectTitle; - } - - /** - * 设置动态对象标题 - * - * @param dynamicObjectTitle - */ - public void setDynamicObjectTitle(String dynamicObjectTitle) { - this.dynamicObjectTitle = dynamicObjectTitle; - } - - /** - * 获取目标对象名称 - * - * @return - */ - public String getTargetName() { - return targetName; - } - - /** - * 设置目标对象名称 - * - * @param targetName - */ - public void setTargetName(String targetName) { - this.targetName = targetName; - } - - /** - * 获取目标访问URL - * - * @return - */ - public String getViewUrl() { - return viewUrl; - } - - /** - * 设置目标访问URL - * - * @param viewUrl - */ - public void setViewUrl(String viewUrl) { - this.viewUrl = viewUrl; - } - - /** - * 获取待办标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置待办标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getWorkTitle() { - return workTitle; - } - - /** - * 设置工作标题 - * - * @param workTitle - */ - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - /** - * 获取待办到达时间 - * - * @return - */ - public String getArriveDateTimeStr() { - return arriveDateTimeStr; - } - - /** - * 设置待办到达时间 - * - * @param arriveDateTimeStr - */ - public void setArriveDateTimeStr(String arriveDateTimeStr) { - this.arriveDateTimeStr = arriveDateTimeStr; - } - - /** - * 获取待办到达时间 - * - * @return - */ - public Date getArriveDateTime() { - return arriveDateTime; - } - - /** - * 设置待办到达时间 - * - * @param arriveDateTime - */ - public void setArriveDateTime(Date arriveDateTime) { - this.arriveDateTime = arriveDateTime; - } - - /** - * 获取办理人所属组织名称 - * - * @return - */ - public String getTargetUnitName() { - return targetUnitName; - } - - /** - * 设置办理人所属组织名称 - * - * @param targetUnitName - */ - public void setTargetUnitName(String targetUnitName) { - this.targetUnitName = targetUnitName; - } - - /** - * 获取办理人所属顶层组织名称 - * - * @return - */ - public String getTargetTopUnitName() { - return targetTopUnitName; - } - - /** - * 设置办理人所属顶层组织名称 - * - * @param targetTopUnitName - */ - public void setTargetTopUnitName(String targetTopUnitName) { - this.targetTopUnitName = targetTopUnitName; - } - - /** - * 获取办理环节名称 - * - * @return - */ - public String getActivityName() { - return activityName; - } - - /** - * 设置办理环节名称 - * - * @param activityName - */ - public void setActivityName(String activityName) { - this.activityName = activityName; - } - - /** - * 获取办理时间 - * - * @return - */ - public Date getProcessDateTime() { - return processDateTime; - } - - /** - * 设置办理时间 - * - * @param processDateTime - */ - public void setProcessDateTime(Date processDateTime) { - this.processDateTime = processDateTime; - } - - /** - * 获取办理时间 - * - * @return - */ - public String getProcessDateTimeStr() { - return processDateTimeStr; - } - - /** - * 设置办理时间 - * - * @param processDateTimeStr - */ - public void setProcessDateTimeStr(String processDateTimeStr) { - this.processDateTimeStr = processDateTimeStr; - } - - /** - * 获取办理耗时 - * - * @return - */ - public Long getDuration() { - return duration; - } - - /** - * 设置办理耗时 - * - * @param duration - */ - public void setDuration(Long duration) { - this.duration = duration; - } - - /** - * 获取办理类别：TASK|READ - * - * @return - */ - public String getProcessType() { - return processType; - } - - /** - * 设置办理类别：TASK|READ - * - * @param processType - */ - public void setProcessType(String processType) { - this.processType = processType; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取目标用户身份 - * - * @return - */ - public String getTargetIdentity() { - return targetIdentity; - } - - /** - * 设置目标用户身份 - * - * @param targetIdentity - */ - public void setTargetIdentity(String targetIdentity) { - this.targetIdentity = targetIdentity; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrUserInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrUserInfo.java deleted file mode 100644 index d4e9ca780d..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrUserInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 系统待办信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrUserInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrUserInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrUserInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrUserInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String userName_FIELDNAME = "userName"; - @FieldDescribe("用户姓名") - @Index(name = TABLE + IndexNameMiddle + userName_FIELDNAME) - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + userName_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String userName = null; - - public static final String customContent_FIELDNAME = "customContent"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("内容") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + customContent_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String customContent = ""; - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getCustomContent() { - return customContent; - } - - public void setCustomContent(String customContent) { - this.customContent = customContent; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAppraiseInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAppraiseInfo.java deleted file mode 100644 index 4cea2d79f4..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAppraiseInfo.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作考核信息实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkAppraiseInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkAppraiseInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkAppraiseInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkAppraiseInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String title_FIELDNAME = "title"; - @FieldDescribe("考核标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = ""; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workTitle = ""; - - public static final String wf_jobId_FIELDNAME = "wf_jobId"; - @FieldDescribe("流程wf_JobID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + wf_jobId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String wf_jobId = ""; - - public static final String wf_workId_FIELDNAME = "wf_workId"; - @FieldDescribe("流程wf_workId") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + wf_workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String wf_workId = ""; - - public static final String activityName_FIELDNAME = "activityName"; - @FieldDescribe("当前审核环节") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + activityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String activityName = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("审核状态") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + status_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = ""; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCenterId() { - return centerId; - } - - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - public String getCenterTitle() { - return centerTitle; - } - - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - public String getWorkId() { - return workId; - } - - public void setWorkId(String workId) { - this.workId = workId; - } - - public String getWorkTitle() { - return workTitle; - } - - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getWf_jobId() { - return wf_jobId; - } - - public void setWf_jobId(String wf_jobId) { - this.wf_jobId = wf_jobId; - } - - public String getWf_workId() { - return wf_workId; - } - - public void setWf_workId(String wf_workId) { - this.wf_workId = wf_workId; - } - - public String getActivityName() { - return activityName; - } - - public void setActivityName(String activityName) { - this.activityName = activityName; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAuthorizeRecord.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAuthorizeRecord.java deleted file mode 100644 index e9e4f0522f..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkAuthorizeRecord.java +++ /dev/null @@ -1,492 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作委托记录信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkAuthorizeRecord.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkAuthorizeRecord.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkAuthorizeRecord extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkAuthorizeRecord.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String title_FIELDNAME = "title"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String title = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = ""; - - public static final String delegatorName_FIELDNAME = "delegatorName"; - @FieldDescribe("委托者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + delegatorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String delegatorName = ""; - - public static final String delegatorIdentity_FIELDNAME = "delegatorIdentity"; - @FieldDescribe("委托者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + delegatorIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String delegatorIdentity = ""; - - public static final String delegatorUnitName_FIELDNAME = "delegatorUnitName"; - @FieldDescribe("委托者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + delegatorUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String delegatorUnitName = ""; - - public static final String delegatorTopUnitName_FIELDNAME = "delegatorTopUnitName"; - @FieldDescribe("委托者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + delegatorTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String delegatorTopUnitName = ""; - - public static final String delegateLevel_FIELDNAME = "delegateLevel"; - @FieldDescribe("委托层级") - @Column(name = ColumnNamePrefix + delegateLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer delegateLevel = 1; - - public static final String targetName_FIELDNAME = "targetName"; - @FieldDescribe("受托者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetName = ""; - - public static final String targetIdentity_FIELDNAME = "targetIdentity"; - @FieldDescribe("受托者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetIdentity = null; - - public static final String targetUnitName_FIELDNAME = "targetUnitName"; - @FieldDescribe("受托者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetUnitName = ""; - - public static final String targetTopUnitName_FIELDNAME = "targetTopUnitName"; - @FieldDescribe("受托者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetTopUnitName = ""; - - public static final String delegateDateTimeStr_FIELDNAME = "delegateDateTimeStr"; - @FieldDescribe("委托时间：yyyy-mm-dd hh:mi:ss") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + delegateDateTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String delegateDateTimeStr = ""; - - public static final String delegateDateTime_FIELDNAME = "delegateDateTime"; - @FieldDescribe("委托时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + delegateDateTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date delegateDateTime = null; - - public static final String takebackDateTime_FIELDNAME = "takebackDateTime"; - @FieldDescribe("收回时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + takebackDateTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date takebackDateTime = null; - - public static final String delegateOpinion_FIELDNAME = "delegateOpinion"; - @FieldDescribe("委托意见") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + delegateOpinion_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String delegateOpinion = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("信息状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - /** - * 获取工作标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置工作标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param parentWorkId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取委托者姓名 - * - * @return - */ - public String getDelegatorName() { - return delegatorName; - } - - /** - * 设置委托者姓名 - * - * @param delegatorName - */ - public void setDelegatorName(String delegatorName) { - this.delegatorName = delegatorName; - } - - /** - * 获取委托者所属组织名称 - * - * @return - */ - public String getDelegatorUnitName() { - return delegatorUnitName; - } - - /** - * 设置委托者所属组织名称 - * - * @param delegatorUnitName - */ - public void setDelegatorUnitName(String delegatorUnitName) { - this.delegatorUnitName = delegatorUnitName; - } - - /** - * 获取委托者所属顶层组织名称 - * - * @return - */ - public String getDelegatorTopUnitName() { - return delegatorTopUnitName; - } - - /** - * 设置委托者所属顶层组织名称 - * - * @param delegatorTopUnitName - */ - public void setDelegatorTopUnitName(String delegatorTopUnitName) { - this.delegatorTopUnitName = delegatorTopUnitName; - } - - /** - * 获取受托者姓名 - * - * @return - */ - public String getTargetName() { - return targetName; - } - - /** - * 设置受托者姓名 - * - * @param targetName - */ - public void setTargetName(String targetName) { - this.targetName = targetName; - } - - /** - * 获取受托者所属组织名称 - * - * @return - */ - public String getTargetUnitName() { - return targetUnitName; - } - - /** - * 设置受托者所属组织名称 - * - * @param targetUnitName - */ - public void setTargetUnitName(String targetUnitName) { - this.targetUnitName = targetUnitName; - } - - /** - * 获取受托者所属顶层组织名称 - * - * @return - */ - public String getTargetTopUnitName() { - return targetTopUnitName; - } - - /** - * 设置受托者所属顶层组织名称 - * - * @param targetTopUnitName - */ - public void setTargetTopUnitName(String targetTopUnitName) { - this.targetTopUnitName = targetTopUnitName; - } - - /** - * 获取委托时间 - * - * @return - */ - public String getDelegateDateTimeStr() { - return delegateDateTimeStr; - } - - /** - * 设置委托时间 - * - * @param delegateDateTimeStr - */ - public void setDelegateDateTimeStr(String delegateDateTimeStr) { - this.delegateDateTimeStr = delegateDateTimeStr; - } - - /** - * 获取委托时间 - * - * @return - */ - public Date getDelegateDateTime() { - return delegateDateTime; - } - - /** - * 设置委托时间 - * - * @param delegateDateTime - */ - public void setDelegateDateTime(Date delegateDateTime) { - this.delegateDateTime = delegateDateTime; - } - - /** - * 获取委托意见 - * - * @return - */ - public String getDelegateOpinion() { - return delegateOpinion; - } - - /** - * 设置委托意见 - * - * @param delegateOpinion - */ - public void setDelegateOpinion(String delegateOpinion) { - this.delegateOpinion = delegateOpinion; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取委托者身份 - * - * @return - */ - public String getDelegatorIdentity() { - return delegatorIdentity; - } - - /** - * 设置委托者身份 - * - * @param delegatorIdentity - */ - public void setDelegatorIdentity(String delegatorIdentity) { - this.delegatorIdentity = delegatorIdentity; - } - - /** - * 获取目标用户身份 - * - * @return - */ - public String getTargetIdentity() { - return targetIdentity; - } - - /** - * 设置目标用户身份 - * - * @param targetIdentity - */ - public void setTargetIdentity(String targetIdentity) { - this.targetIdentity = targetIdentity; - } - - public Integer getDelegateLevel() { - return delegateLevel; - } - - public void setDelegateLevel(Integer delegateLevel) { - this.delegateLevel = delegateLevel; - } - - public Date getTakebackDateTime() { - return takebackDateTime; - } - - public void setTakebackDateTime(Date takebackDateTime) { - this.takebackDateTime = takebackDateTime; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkBaseInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkBaseInfo.java deleted file mode 100644 index baf18f1a5d..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkBaseInfo.java +++ /dev/null @@ -1,1573 +0,0 @@ -package com.x.okr.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.PersistentCollection; -import org.apache.openjpa.persistence.jdbc.ContainerTable; -import org.apache.openjpa.persistence.jdbc.ElementColumn; -import org.apache.openjpa.persistence.jdbc.ElementIndex; -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作基础信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkBaseInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkBaseInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkBaseInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkBaseInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String title_FIELDNAME = "title"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = ""; - - public static final String parentWorkId_FIELDNAME = "parentWorkId"; - @FieldDescribe("上级工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + parentWorkId_FIELDNAME) - @Index(name = TABLE + "_parentWorkId") - @CheckPersist(allowEmpty = true) - private String parentWorkId = ""; - - public static final String parentWorkTitle_FIELDNAME = "parentWorkTitle"; - @FieldDescribe("上级工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + parentWorkTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String parentWorkTitle = ""; - - public static final String workDateTimeType_FIELDNAME = "workDateTimeType"; - @FieldDescribe("工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报）") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workDateTimeType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workDateTimeType = "长期工作"; - - public static final String deployYear_FIELDNAME = "deployYear"; - @FieldDescribe("工作部署年份") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + deployYear_FIELDNAME) - @Index(name = TABLE + "_deployYear") - @CheckPersist(allowEmpty = true) - private String deployYear = ""; - - public static final String deployMonth_FIELDNAME = "deployMonth"; - @FieldDescribe("工作部署月份") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + deployMonth_FIELDNAME) - @Index(name = TABLE + "_deployMonth") - @CheckPersist(allowEmpty = true) - private String deployMonth = ""; - - public static final String deployerName_FIELDNAME = "deployerName"; - @FieldDescribe("部署者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerName = ""; - - public static final String deployerIdentity_FIELDNAME = "deployerIdentity"; - @FieldDescribe("部署者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerIdentity = ""; - - public static final String deployerUnitName_FIELDNAME = "deployerUnitName"; - @FieldDescribe("部署者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerUnitName = ""; - - public static final String deployerTopUnitName_FIELDNAME = "deployerTopUnitName"; - @FieldDescribe("部署者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + deployerTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployerTopUnitName = ""; - - public static final String creatorName_FIELDNAME = "creatorName"; - @FieldDescribe("创建者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorName = ""; - - public static final String creatorIdentity_FIELDNAME = "creatorIdentity"; - @FieldDescribe("创建者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorIdentity = ""; - - public static final String creatorUnitName_FIELDNAME = "creatorUnitName"; - @FieldDescribe("创建者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorUnitName = ""; - - public static final String creatorTopUnitName_FIELDNAME = "creatorTopUnitName"; - @FieldDescribe("创建者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorTopUnitName = ""; - - public static final String deployDateStr_FIELDNAME = "deployDateStr"; - @FieldDescribe("工作部署日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + deployDateStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployDateStr = ""; - - public static final String confirmDateStr_FIELDNAME = "confirmDateStr"; - @FieldDescribe("工作确认日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + confirmDateStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String confirmDateStr = ""; - - public static final String completeDateLimit_FIELDNAME = "completeDateLimit"; - - @FieldDescribe("工作完成日期") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + completeDateLimit_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date completeDateLimit = null; - - public static final String archiveDate_FIELDNAME = "archiveDate"; - @FieldDescribe("工作归档时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + archiveDate_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date archiveDate = null; - - public static final String completeDateLimitStr_FIELDNAME = "completeDateLimitStr"; - @FieldDescribe("工作完成日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + completeDateLimitStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String completeDateLimitStr = ""; - - public static final String responsibilityEmployeeName_FIELDNAME = "responsibilityEmployeeName"; - @FieldDescribe("主责人姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityEmployeeName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityEmployeeName = ""; - - public static final String responsibilityIdentity_FIELDNAME = "responsibilityIdentity"; - @FieldDescribe("主责人身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityIdentity = ""; - - public static final String responsibilityUnitName_FIELDNAME = "responsibilityUnitName"; - @FieldDescribe("主责人所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityUnitName = ""; - - public static final String responsibilityTopUnitName_FIELDNAME = "responsibilityTopUnitName"; - @FieldDescribe("主责人所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + responsibilityTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String responsibilityTopUnitName = ""; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String workLevel_FIELDNAME = "workLevel"; - @FieldDescribe("工作级别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workLevel = ""; - - public static final String overallProgress_FIELDNAME = "overallProgress"; - @FieldDescribe("工作进度") - @Column(name = ColumnNamePrefix + overallProgress_FIELDNAME) - private Integer overallProgress = 0; - - public static final String workProcessStatus_FIELDNAME = "workProcessStatus"; - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workProcessStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workProcessStatus = "草稿"; - - public static final String isOverTime_FIELDNAME = "isOverTime"; - @FieldDescribe("工作是否已超期") - @Column(name = ColumnNamePrefix + isOverTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isOverTime = false; - - public static final String isCompleted_FIELDNAME = "isCompleted"; - @FieldDescribe("工作是否已完成") - @Column(name = ColumnNamePrefix + isCompleted_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isCompleted = false; - - public static final String completeTime_FIELDNAME = "completeTime"; - @FieldDescribe("工作完成时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + completeTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date completeTime = null; - - public static final String lastReportTime_FIELDNAME = "lastReportTime"; - @FieldDescribe("上一次汇报时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + lastReportTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date lastReportTime = null; - - public static final String nextReportTime_FIELDNAME = "nextReportTime"; - @FieldDescribe("下一次汇报时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + nextReportTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date nextReportTime = null; - - public static final String reportCount_FIELDNAME = "reportCount"; - @FieldDescribe("已汇报次数") - @Column(name = ColumnNamePrefix + reportCount_FIELDNAME) - private Integer reportCount = 0; - - public static final String reportTimeQue_FIELDNAME = "reportTimeQue"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("汇报时间队列") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + reportTimeQue_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportTimeQue = null; - - public static final String reportCycle_FIELDNAME = "reportCycle"; - @FieldDescribe("汇报周期:不需要汇报|每月汇报|每周汇报") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + reportCycle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportCycle = null; - - public static final String isNeedReport_FIELDNAME = "isNeedReport"; - @FieldDescribe("是否需要定期汇报") - @Column(name = ColumnNamePrefix + isNeedReport_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isNeedReport = true; - - public static final String reportDayInCycle_FIELDNAME = "reportDayInCycle"; - @FieldDescribe("周期汇报时间：每月的几号(1-31)，每周的星期几(1-7)，启动时间由系统配置设定，比如：10:00") - @Column(name = ColumnNamePrefix + reportDayInCycle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer reportDayInCycle = 0; - - public static final String workAuditLevel_FIELDNAME = "workAuditLevel"; - @FieldDescribe("工作部署级别") - @Column(name = ColumnNamePrefix + workAuditLevel_FIELDNAME) - private Integer workAuditLevel = 1; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - public static final String reportNeedAdminAudit_FIELDNAME = "reportNeedAdminAudit"; - @FieldDescribe("工作汇报是否需要管理补充信息") - @Column(name = ColumnNamePrefix + reportNeedAdminAudit_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean reportNeedAdminAudit = false; - - public static final String reportAdminName_FIELDNAME = "reportAdminName"; - @FieldDescribe("工作管理员姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reportAdminName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportAdminName = null; - - public static final String reportAdminIdentity_FIELDNAME = "reportAdminIdentity"; - @FieldDescribe("工作管理员身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reportAdminIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportAdminIdentity = null; - - public static final String shortWorkDetail_FIELDNAME = "shortWorkDetail"; - @FieldDescribe("工作详细描述, 事项分解") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortWorkDetail_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortWorkDetail = ""; - - public static final String shortDutyDescription_FIELDNAME = "shortDutyDescription"; - @FieldDescribe("职责描述") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortDutyDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortDutyDescription = ""; - - public static final String shortProgressAction_FIELDNAME = "shortProgressAction"; - @FieldDescribe("具体行动举措") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortProgressAction_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortProgressAction = ""; - - public static final String shortLandmarkDescription_FIELDNAME = "shortLandmarkDescription"; - @FieldDescribe("里程碑标志说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortLandmarkDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortLandmarkDescription = ""; - - public static final String shortResultDescription_FIELDNAME = "shortResultDescription"; - @FieldDescribe("交付成果说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortResultDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortResultDescription = ""; - - public static final String shortMajorIssuesDescription_FIELDNAME = "shortMajorIssuesDescription"; - @FieldDescribe("重点事项说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortMajorIssuesDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortMajorIssuesDescription = ""; - - public static final String shortProgressPlan_FIELDNAME = "shortProgressPlan"; - @FieldDescribe("进展计划时限说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortProgressPlan_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortProgressPlan = ""; - - public static final String progressAnalyseTime_FIELDNAME = "progressAnalyseTime"; - @FieldDescribe("工作进展分析时间") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + progressAnalyseTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String progressAnalyseTime = ""; - - public static final String currentAppraiseTitle_FIELDNAME = "currentAppraiseTitle"; - @FieldDescribe("当前考核流程标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + currentAppraiseTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String currentAppraiseTitle = "无标题"; - - public static final String currentAppraiseInfoId_FIELDNAME = "currentAppraiseInfoId"; - @FieldDescribe("当前OKR考核流程信息ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + currentAppraiseInfoId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String currentAppraiseInfoId = ""; - - public static final String currentAppraiseWorkId_FIELDNAME = "currentAppraiseWorkId"; - @FieldDescribe("当前考核流程WorkID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + currentAppraiseWorkId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String currentAppraiseWorkId = ""; - - public static final String currentAppraiseJobId_FIELDNAME = "currentAppraiseJobId"; - @FieldDescribe("当前考核流程JobID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + currentAppraiseJobId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String currentAppraiseJobId = ""; - - public static final String currentActivityName_FIELDNAME = "currentActivityName"; - @FieldDescribe("当前考核流程环节名称") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + currentActivityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String currentActivityName = ""; - - public static final String currentAppraiseStatus_FIELDNAME = "currentAppraiseStatus"; - @FieldDescribe("当前考核审核状态") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + currentAppraiseStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String currentAppraiseStatus = ""; - - public static final String appraiseTimes_FIELDNAME = "appraiseTimes"; - @FieldDescribe("考核次数") - @Column(name = ColumnNamePrefix + appraiseTimes_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer appraiseTimes = 0; - - public static final String cooperateEmployeeNameList_FIELDNAME = "cooperateEmployeeNameList"; - @FieldDescribe("协助人姓名，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + cooperateEmployeeNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + cooperateEmployeeNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + cooperateEmployeeNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + cooperateEmployeeNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List cooperateEmployeeNameList; - - public static final String cooperateIdentityList_FIELDNAME = "cooperateIdentityList"; - @FieldDescribe("协助人身份，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + cooperateIdentityList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + cooperateIdentityList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + cooperateIdentityList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + cooperateIdentityList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List cooperateIdentityList; - - public static final String cooperateUnitNameList_FIELDNAME = "cooperateUnitNameList"; - @FieldDescribe("协助人所属组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + cooperateUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + cooperateUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + cooperateUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + cooperateUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List cooperateUnitNameList; - - public static final String cooperateTopUnitNameList_FIELDNAME = "cooperateTopUnitNameList"; - @FieldDescribe("协助人所属顶层组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + cooperateTopUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + cooperateTopUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + cooperateTopUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + cooperateTopUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List cooperateTopUnitNameList; - - public static final String readLeaderIdentityList_FIELDNAME = "readLeaderIdentityList"; - @FieldDescribe("阅知领导身份，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + readLeaderIdentityList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + readLeaderIdentityList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + readLeaderIdentityList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + readLeaderIdentityList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List readLeaderIdentityList; - - public static final String readLeaderNameList_FIELDNAME = "readLeaderNameList"; - @FieldDescribe("阅知领导，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + readLeaderNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + readLeaderNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + readLeaderNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + readLeaderNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List readLeaderNameList; - - public static final String readLeaderUnitNameList_FIELDNAME = "readLeaderUnitNameList"; - @FieldDescribe("阅知领导所属组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + readLeaderUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + readLeaderUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + readLeaderUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + readLeaderUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List readLeaderUnitNameList; - - public static final String readLeaderTopUnitNameList_FIELDNAME = "readLeaderTopUnitNameList"; - @FieldDescribe("阅知领导所属顶层组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + readLeaderTopUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + readLeaderTopUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + readLeaderTopUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + readLeaderTopUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List readLeaderTopUnitNameList; - - public static final String attachmentList_FIELDNAME = "attachmentList"; - @FieldDescribe("附件列表") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle + attachmentList_FIELDNAME, joinIndex = @Index(name = TABLE - + IndexNameMiddle + attachmentList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + attachmentList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + attachmentList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List attachmentList; - - public static final String appraiseInfoList_FIELDNAME = "appraiseInfoList"; - @FieldDescribe("考核流程信息ID列表") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + appraiseInfoList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle + appraiseInfoList_FIELDNAME - + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + appraiseInfoList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + appraiseInfoList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List appraiseInfoList; - - /** - * 获取工作标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置工作标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取上级工作ID - * - * @return - */ - public String getParentWorkId() { - return parentWorkId; - } - - /** - * 设置上级工作ID - * - * @param parentWorkId - */ - public void setParentWorkId(String parentWorkId) { - this.parentWorkId = parentWorkId; - } - - /** - * 获取上级工作标题 - * - * @return - */ - public String getParentWorkTitle() { - return parentWorkTitle; - } - - /** - * 设置上级工作标题 - * - * @param parentWorkTitle - */ - public void setParentWorkTitle(String parentWorkTitle) { - this.parentWorkTitle = parentWorkTitle; - } - - /** - * 获取部署者姓名 - * - * @return - */ - public String getDeployerName() { - return deployerName; - } - - /** - * 设置部署者姓名 - * - * @param deployerName - */ - public void setDeployerName(String deployerName) { - this.deployerName = deployerName; - } - - /** - * 获取部署者所属组织名称 - * - * @return - */ - public String getDeployerUnitName() { - return deployerUnitName; - } - - /** - * 设置部署者所属组织名称 - * - * @param deployerUnitName - */ - public void setDeployerUnitName(String deployerUnitName) { - this.deployerUnitName = deployerUnitName; - } - - /** - * 获取部署者所属顶层组织名称 - * - * @return - */ - public String getDeployerTopUnitName() { - return deployerTopUnitName; - } - - /** - * 设置部署者所属顶层组织名称 - * - * @param deployerTopUnitName - */ - public void setDeployerTopUnitName(String deployerTopUnitName) { - this.deployerTopUnitName = deployerTopUnitName; - } - - /** - * 获取创建者姓名 - * - * @return - */ - public String getCreatorName() { - return creatorName; - } - - /** - * 设置创建者姓名 - * - * @param creatorName - */ - public void setCreatorName(String creatorName) { - this.creatorName = creatorName; - } - - /** - * 获取创建者所属组织名称 - * - * @return - */ - public String getCreatorUnitName() { - return creatorUnitName; - } - - /** - * 设置创建者所属组织名称 - * - * @param creatorUnitName - */ - public void setCreatorUnitName(String creatorUnitName) { - this.creatorUnitName = creatorUnitName; - } - - /** - * 获取创建者所属顶层组织名称 - * - * @return - */ - public String getCreatorTopUnitName() { - return creatorTopUnitName; - } - - /** - * 设置创建者所属顶层组织名称 - * - * @param creatorTopUnitName - */ - public void setCreatorTopUnitName(String creatorTopUnitName) { - this.creatorTopUnitName = creatorTopUnitName; - } - - /** - * 获取部署日期 - * - * @return - */ - public String getDeployDateStr() { - return deployDateStr; - } - - /** - * 设置部署日期 - * - * @param deployDateStr - */ - public void setDeployDateStr(String deployDateStr) { - this.deployDateStr = deployDateStr; - } - - /** - * 获取工作确认日期 - * - * @return - */ - public String getConfirmDateStr() { - return confirmDateStr; - } - - /** - * 设置工作确认日期 - * - * @param confirmDateStr - */ - public void setConfirmDateStr(String confirmDateStr) { - this.confirmDateStr = confirmDateStr; - } - - /** - * 获取工作完成时限 - * - * @return - */ - public Date getCompleteDateLimit() { - return completeDateLimit; - } - - /** - * 设置工作完成时限 - * - * @param completeDateLimit - */ - public void setCompleteDateLimit(Date completeDateLimit) { - this.completeDateLimit = completeDateLimit; - } - - /** - * 获取工作完成时限（字符串） - * - * @return - */ - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - /** - * 设置工作完成时限（字符串） - * - * @param completeDateLimitStr - */ - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - /** - * 获取主责人姓名 - * - * @return - */ - public String getResponsibilityEmployeeName() { - return responsibilityEmployeeName; - } - - /** - * 设置主责人姓名 - * - * @param responsibilityEmployeeName - */ - public void setResponsibilityEmployeeName(String responsibilityEmployeeName) { - this.responsibilityEmployeeName = responsibilityEmployeeName; - } - - /** - * 获取主责人所属组织名称 - * - * @return - */ - public String getResponsibilityUnitName() { - return responsibilityUnitName; - } - - /** - * 设置主责人所属组织名称 - * - * @param responsibilityUnitName - */ - public void setResponsibilityUnitName(String responsibilityUnitName) { - this.responsibilityUnitName = responsibilityUnitName; - } - - /** - * 获取主责人所属顶层组织名称 - * - * @return - */ - public String getResponsibilityTopUnitName() { - return responsibilityTopUnitName; - } - - /** - * 设置主责人所属顶层组织名称 - * - * @param responsibilityTopUnitName - */ - public void setResponsibilityTopUnitName(String responsibilityTopUnitName) { - this.responsibilityTopUnitName = responsibilityTopUnitName; - } - - public Integer getOverallProgress() { - return overallProgress; - } - - public void setOverallProgress(Integer overallProgress) { - this.overallProgress = overallProgress; - } - - /** - * 获取工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消 - * - * @return - */ - public String getWorkProcessStatus() { - return workProcessStatus; - } - - /** - * 设置工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消 - * - * @param workProcessStatus - */ - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - /** - * 获取上一次汇报时间 - * - * @return - */ - public Date getLastReportTime() { - return lastReportTime; - } - - /** - * 设置上一次汇报时间 - * - * @param lastReportTime - */ - public void setLastReportTime(Date lastReportTime) { - this.lastReportTime = lastReportTime; - } - - /** - * 获取下一次汇报时间 - * - * @return - */ - public Date getNextReportTime() { - return nextReportTime; - } - - /** - * 设置下一次汇报时间 - * - * @param nextReportTime - */ - public void setNextReportTime(Date nextReportTime) { - this.nextReportTime = nextReportTime; - } - - /** - * 获取工作汇报次数 - * - * @return - */ - public Integer getReportCount() { - return reportCount; - } - - /** - * 设置工作汇报次数 - * - * @param reportCount - */ - public void setReportCount(Integer reportCount) { - this.reportCount = reportCount; - } - - /** - * 获取工作汇报时间队列，从工作部署日期到工作完成日期，根据汇报周期要求，分析出汇报时间队列以JSON方式存储 - * - * @return - */ - public String getReportTimeQue() { - return reportTimeQue; - } - - /** - * 设置工作汇报时间队列，从工作部署日期到工作完成日期，根据汇报周期要求，分析出汇报时间队列以JSON方式存储 - * - * @param reportTimeQue - */ - public void setReportTimeQue(String reportTimeQue) { - this.reportTimeQue = reportTimeQue; - } - - /** - * 获取汇报周期设定：每月汇报|每周汇报 - * - * @return - */ - public String getReportCycle() { - return reportCycle; - } - - /** - * 设置汇报周期：每月汇报|每周汇报 - * - * @param reportCycle - */ - public void setReportCycle(String reportCycle) { - this.reportCycle = reportCycle; - } - - /** - * 获取周期汇报日期设定：每月的几号，每周的星期几，启动时间由系统配置设定，比如：10:00 - * - * @return - */ - public Integer getReportDayInCycle() { - return reportDayInCycle; - } - - /** - * 设置周期汇报日期：每月的几号，每周的星期几，启动时间由系统配置设定，比如：10:00 - * - * @param reportDayInCycle - */ - public void setReportDayInCycle(Integer reportDayInCycle) { - this.reportDayInCycle = reportDayInCycle; - } - - /** - * 获取工作类别：工作类别由工作类别配置表决定 - * - * @return - */ - public String getWorkType() { - return workType; - } - - /** - * 设置工作类别：工作类别由工作类别配置表决定 - * - * @param workType - */ - public void setWorkType(String workType) { - this.workType = workType; - } - - /** - * 获取工作级别：工作级别由工作级别配置表决定 - * - * @return - */ - public String getWorkLevel() { - return workLevel; - } - - /** - * 设置工作级别：工作级别由工作级别配置表决定 - * - * @param workLevel - */ - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - /** - * 获取工作部署年份 - * - * @return - */ - public String getDeployYear() { - return deployYear; - } - - /** - * 设置工作部署年份 - * - * @param deployYear - */ - public void setDeployYear(String deployYear) { - this.deployYear = deployYear; - } - - /** - * 获取工作部署月份 - * - * @return - */ - public String getDeployMonth() { - return deployMonth; - } - - /** - * 设置工作部署月份 - * - * @param deployMonth - */ - public void setDeployMonth(String deployMonth) { - this.deployMonth = deployMonth; - } - - /** - * 获取工作是否已超期 - * - * @return - */ - public Boolean getIsOverTime() { - return isOverTime; - } - - /** - * 设置工作是否已超期 - * - * @param isOverTime - */ - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - /** - * 获取工作是否已完成 - * - * @return - */ - public Boolean getIsCompleted() { - return isCompleted; - } - - /** - * 设置工作是否已完成 - * - * @param isCompleted - */ - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - /** - * 获取工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - * - * @return - */ - public String getWorkDateTimeType() { - return workDateTimeType; - } - - /** - * 设置工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - * - * @param workDateTimeType - */ - public void setWorkDateTimeType(String workDateTimeType) { - this.workDateTimeType = workDateTimeType; - } - - /** - * 获取工作审核层级 - * - * @return - */ - public Integer getWorkAuditLevel() { - return workAuditLevel; - } - - /** - * 工作审核层级 - * - * @param workAuditLevel - */ - public void setWorkAuditLevel(Integer workAuditLevel) { - this.workAuditLevel = workAuditLevel; - } - - // ================================================================================================== - // ===================== 其他方法 - // ============================================================= - // ================================================================================================== - /** - * 增加一个工作审核层级 - */ - public void addWorkAuditLevel() { - this.workAuditLevel++; - } - - /** - * 减少一个工作审核层级 - */ - public void minusWorkAuditLevel() { - this.workAuditLevel--; - } - - /** - * 增加一次已汇报次数 - */ - public void addWorkReportCount() { - this.reportCount++; - } - - /** - * 减少一次已汇报次数 - */ - public void minusaWorkReportCount() { - this.reportCount--; - } - - /** - * 获取是否需要汇报 - * - * @return - */ - public Boolean getIsNeedReport() { - return isNeedReport; - } - - /** - * 设置是否需要汇报 - * - * @param needReport - */ - public void setIsNeedReport(Boolean isNeedReport) { - this.isNeedReport = isNeedReport; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取工作汇报是否需要管理员审核 - * - * @return - */ - public Boolean getReportNeedAdminAudit() { - return reportNeedAdminAudit; - } - - /** - * 设置工作汇报是否需要管理员审核 - * - * @param reportNeedAdminAudit - */ - public void setReportNeedAdminAudit(Boolean reportNeedAdminAudit) { - this.reportNeedAdminAudit = reportNeedAdminAudit; - } - - /** - * 获取工作管理员姓名 - * - * @return - */ - public String getReportAdminName() { - return reportAdminName; - } - - /** - * 设置工作管理员姓名 - * - * @param reportAdminName - */ - public void setReportAdminName(String reportAdminName) { - this.reportAdminName = reportAdminName; - } - - /** - * 获取附件列表 - * - * @return - */ - public List getAttachmentList() { - return attachmentList; - } - - /** - * 设置附件列表 - * - * @param attachmentList - */ - public void setAttachmentList(List attachmentList) { - this.attachmentList = attachmentList; - } - - public String getDeployerIdentity() { - return deployerIdentity; - } - - public void setDeployerIdentity(String deployerIdentity) { - this.deployerIdentity = deployerIdentity; - } - - public String getCreatorIdentity() { - return creatorIdentity; - } - - public void setCreatorIdentity(String creatorIdentity) { - this.creatorIdentity = creatorIdentity; - } - - public String getResponsibilityIdentity() { - return responsibilityIdentity; - } - - public void setResponsibilityIdentity(String responsibilityIdentity) { - this.responsibilityIdentity = responsibilityIdentity; - } - - public String getReportAdminIdentity() { - return reportAdminIdentity; - } - - public void setReportAdminIdentity(String reportAdminIdentity) { - this.reportAdminIdentity = reportAdminIdentity; - } - - public String getShortWorkDetail() { - return shortWorkDetail; - } - - public void setShortWorkDetail(String shortWorkDetail) { - this.shortWorkDetail = shortWorkDetail; - } - - public String getShortDutyDescription() { - return shortDutyDescription; - } - - public void setShortDutyDescription(String shortDutyDescription) { - this.shortDutyDescription = shortDutyDescription; - } - - public String getShortProgressAction() { - return shortProgressAction; - } - - public void setShortProgressAction(String shortProgressAction) { - this.shortProgressAction = shortProgressAction; - } - - public String getShortLandmarkDescription() { - return shortLandmarkDescription; - } - - public void setShortLandmarkDescription(String shortLandmarkDescription) { - this.shortLandmarkDescription = shortLandmarkDescription; - } - - public String getShortResultDescription() { - return shortResultDescription; - } - - public void setShortResultDescription(String shortResultDescription) { - this.shortResultDescription = shortResultDescription; - } - - public String getShortMajorIssuesDescription() { - return shortMajorIssuesDescription; - } - - public void setShortMajorIssuesDescription(String shortMajorIssuesDescription) { - this.shortMajorIssuesDescription = shortMajorIssuesDescription; - } - - public String getShortProgressPlan() { - return shortProgressPlan; - } - - public void setShortProgressPlan(String shortProgressPlan) { - this.shortProgressPlan = shortProgressPlan; - } - - public String getProgressAnalyseTime() { - return progressAnalyseTime; - } - - public void setProgressAnalyseTime(String progressAnalyseTime) { - this.progressAnalyseTime = progressAnalyseTime; - } - - public Date getArchiveDate() { - return archiveDate; - } - - public void setArchiveDate(Date archiveDate) { - this.archiveDate = archiveDate; - } - - public Date getCompleteTime() { - return completeTime; - } - - public void setCompleteTime(Date completeTime) { - this.completeTime = completeTime; - } - - public Boolean getOverTime() { - return isOverTime; - } - - public void setOverTime(Boolean overTime) { - isOverTime = overTime; - } - - public Boolean getCompleted() { - return isCompleted; - } - - public void setCompleted(Boolean completed) { - isCompleted = completed; - } - - public Boolean getNeedReport() { - return isNeedReport; - } - - public void setNeedReport(Boolean needReport) { - isNeedReport = needReport; - } - - public String getCurrentAppraiseInfoId() { - return currentAppraiseInfoId; - } - - public void setCurrentAppraiseInfoId(String currentAppraiseInfoId) { - this.currentAppraiseInfoId = currentAppraiseInfoId; - } - - public String getCurrentAppraiseWorkId() { - return currentAppraiseWorkId; - } - - public void setCurrentAppraiseWorkId(String currentAppraiseWorkId) { - this.currentAppraiseWorkId = currentAppraiseWorkId; - } - - public String getCurrentActivityName() { - return currentActivityName; - } - - public void setCurrentActivityName(String currentActivityName) { - this.currentActivityName = currentActivityName; - } - - public String getCurrentAppraiseStatus() { - return currentAppraiseStatus; - } - - public void setCurrentAppraiseStatus(String currentAppraiseStatus) { - this.currentAppraiseStatus = currentAppraiseStatus; - } - - public List getAppraiseInfoList() { - return appraiseInfoList; - } - - public void setAppraiseInfoList(List appraiseInfoList) { - this.appraiseInfoList = appraiseInfoList; - } - - public Integer getAppraiseTimes() { - return appraiseTimes; - } - - public void setAppraiseTimes(Integer appraiseTimes) { - this.appraiseTimes = appraiseTimes; - } - - public String getCurrentAppraiseTitle() { - return currentAppraiseTitle; - } - - public void setCurrentAppraiseTitle(String currentAppraiseTitle) { - this.currentAppraiseTitle = currentAppraiseTitle; - } - - public String getCurrentAppraiseJobId() { - return currentAppraiseJobId; - } - - public void setCurrentAppraiseJobId(String currentAppraiseJobId) { - this.currentAppraiseJobId = currentAppraiseJobId; - } - - public List getCooperateEmployeeNameList() { - return cooperateEmployeeNameList == null ? new ArrayList<>() : cooperateEmployeeNameList; - } - - public List getCooperateIdentityList() { - return cooperateIdentityList == null ? new ArrayList<>() : cooperateIdentityList; - } - - public List getCooperateUnitNameList() { - return cooperateUnitNameList == null ? new ArrayList<>() : cooperateUnitNameList; - } - - public List getCooperateTopUnitNameList() { - return cooperateTopUnitNameList == null ? new ArrayList<>() : cooperateTopUnitNameList; - } - - public List getReadLeaderIdentityList() { - return readLeaderIdentityList == null ? new ArrayList<>() : readLeaderIdentityList; - } - - public List getReadLeaderNameList() { - return readLeaderNameList == null ? new ArrayList<>() : readLeaderNameList; - } - - public List getReadLeaderUnitNameList() { - return readLeaderUnitNameList == null ? new ArrayList<>() : readLeaderUnitNameList; - } - - public List getReadLeaderTopUnitNameList() { - return readLeaderTopUnitNameList == null ? new ArrayList<>() : readLeaderTopUnitNameList; - } - - public void setCooperateEmployeeNameList(List cooperateEmployeeNameList) { - this.cooperateEmployeeNameList = cooperateEmployeeNameList; - } - - public void setCooperateIdentityList(List cooperateIdentityList) { - this.cooperateIdentityList = cooperateIdentityList; - } - - public void setCooperateUnitNameList(List cooperateUnitNameList) { - this.cooperateUnitNameList = cooperateUnitNameList; - } - - public void setCooperateTopUnitNameList(List cooperateTopUnitNameList) { - this.cooperateTopUnitNameList = cooperateTopUnitNameList; - } - - public void setReadLeaderIdentityList(List readLeaderIdentityList) { - this.readLeaderIdentityList = readLeaderIdentityList; - } - - public void setReadLeaderNameList(List readLeaderNameList) { - this.readLeaderNameList = readLeaderNameList; - } - - public void setReadLeaderUnitNameList(List readLeaderUnitNameList) { - this.readLeaderUnitNameList = readLeaderUnitNameList; - } - - public void setReadLeaderTopUnitNameList(List readLeaderTopUnitNameList) { - this.readLeaderTopUnitNameList = readLeaderTopUnitNameList; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkChat.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkChat.java deleted file mode 100644 index 555490bd8f..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkChat.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作交流信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkChat.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkChat.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkChat extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - - private static final String TABLE = PersistenceProperties.OkrWorkChat.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = null; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = null; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = null; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workTitle = null; - - public static final String senderName_FIELDNAME = "senderName"; - @FieldDescribe("发送者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + senderName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String senderName = null; - - public static final String senderIdentity_FIELDNAME = "senderIdentity"; - @FieldDescribe("发送者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + senderIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String senderIdentity = null; - - public static final String targetName_FIELDNAME = "targetName"; - @FieldDescribe("目标者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetName = null; - - public static final String targetIdentity_FIELDNAME = "targetIdentity"; - @FieldDescribe("目标者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetIdentity = null; - - public static final String content_FIELDNAME = "content"; - @Lob - @FieldDescribe("内容") - @Column(length = JpaObject.length_1M, name = ColumnNamePrefix + content_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String content = null; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - /** - * 获取目标对象名称 - * - * @return - */ - public String getTargetName() { - return targetName; - } - - /** - * 设置目标对象名称 - * - * @param targetName - */ - public void setTargetName(String targetName) { - this.targetName = targetName; - } - - /** - * 获取操作描述 - * - * @return - */ - public String getContent() { - return content; - } - - /** - * 设置操作描述 - * - * @param content - */ - public void setContent(String content) { - this.content = content; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置备注说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * 获取中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getWorkTitle() { - return workTitle; - } - - /** - * 设置工作标题 - * - * @param workTitle - */ - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getTargetIdentity() { - return targetIdentity; - } - - public void setTargetIdentity(String targetIdentity) { - this.targetIdentity = targetIdentity; - } - - public String getSenderName() { - return senderName; - } - - public void setSenderName(String senderName) { - this.senderName = senderName; - } - - public String getSenderIdentity() { - return senderIdentity; - } - - public void setSenderIdentity(String senderIdentity) { - this.senderIdentity = senderIdentity; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDetailInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDetailInfo.java deleted file mode 100644 index 5e338836aa..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDetailInfo.java +++ /dev/null @@ -1,297 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作详细描述信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkDetailInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkDetailInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkDetailInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkDetailInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = ""; - - public static final String workDetail_FIELDNAME = "workDetail"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("工作详细描述, 事项分解") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + workDetail_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workDetail = ""; - - public static final String dutyDescription_FIELDNAME = "dutyDescription"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("职责描述") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + dutyDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dutyDescription = ""; - - public static final String progressAction_FIELDNAME = "progressAction"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("具体行动举措") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + progressAction_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String progressAction = ""; - - public static final String landmarkDescription_FIELDNAME = "landmarkDescription"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("里程碑标志说明") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + landmarkDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String landmarkDescription = ""; - - public static final String resultDescription_FIELDNAME = "resultDescription"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("交付成果说明") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + resultDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String resultDescription = ""; - - public static final String majorIssuesDescription_FIELDNAME = "majorIssuesDescription"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("重点事项说明") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + majorIssuesDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String majorIssuesDescription = ""; - - public static final String progressPlan_FIELDNAME = "progressPlan"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("进展计划时限说明") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + progressPlan_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String progressPlan = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String status = "正常"; - - /** - * 获取中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取工作详细描述信息 - * - * @return - */ - public String getWorkDetail() { - return workDetail; - } - - /** - * 设置工作详细描述信息 - * - * @param workDetail - */ - public void setWorkDetail(String workDetail) { - this.workDetail = workDetail; - } - - /** - * 获取工作职责描述 - * - * @return - */ - public String getDutyDescription() { - return dutyDescription; - } - - /** - * 设置工作职责描述 - * - * @param dutyDescription - */ - public void setDutyDescription(String dutyDescription) { - this.dutyDescription = dutyDescription; - } - - /** - * 获取工作具体行动举措 - * - * @return - */ - public String getProgressAction() { - return progressAction; - } - - /** - * 设置工作具体行动举措 - * - * @param progressAction - */ - public void setProgressAction(String progressAction) { - this.progressAction = progressAction; - } - - /** - * 获取工作里程碑标志说明 - * - * @return - */ - public String getLandmarkDescription() { - return landmarkDescription; - } - - /** - * 设置工作交付成果说明 - * - * @param landmarkDescription - */ - public void setLandmarkDescription(String landmarkDescription) { - this.landmarkDescription = landmarkDescription; - } - - /** - * 获取工作交付成果说明 - * - * @return - */ - public String getResultDescription() { - return resultDescription; - } - - /** - * 设置工作交付成果说明 - * - * @param resultDescription - */ - public void setResultDescription(String resultDescription) { - this.resultDescription = resultDescription; - } - - /** - * 获取工作重点事项说明 - * - * @return - */ - public String getMajorIssuesDescription() { - return majorIssuesDescription; - } - - /** - * 设置工作重点事项说明 - * - * @param majorIssuesDescription - */ - public void setMajorIssuesDescription(String majorIssuesDescription) { - this.majorIssuesDescription = majorIssuesDescription; - } - - /** - * 获取工作进展计划时限说明（后续工作计划说明） - * - * @return - */ - public String getProgressPlan() { - return progressPlan; - } - - /** - * 设置工作进展计划时限说明（后续工作计划说明） - * - * @param progressPlan - */ - public void setProgressPlan(String progressPlan) { - this.progressPlan = progressPlan; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDynamics.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDynamics.java deleted file mode 100644 index 2c023f3354..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkDynamics.java +++ /dev/null @@ -1,478 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作动态信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkDynamics.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkDynamics.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkDynamics extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkDynamics.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String dynamicType_FIELDNAME = "dynamicType"; - @FieldDescribe("工作动态类别：工作部署|工作确认|工作拆解|创建工作汇报|提交工作汇报|审阅工作汇报|创建问题请示|提交问题请示|审阅问题请示|交流") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + dynamicType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicType = "未知类别"; - - public static final String dynamicObjectType_FIELDNAME = "dynamicObjectType"; - @FieldDescribe("动态对象类别:中心工作|工作|工作汇报|问题请示|交流") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + dynamicObjectType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + dynamicObjectType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectType = "未知类别"; - - public static final String dynamicObjectId_FIELDNAME = "dynamicObjectId"; - @FieldDescribe("动态对象ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + dynamicObjectId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + dynamicObjectId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectId = null; - - public static final String dynamicObjectTitle_FIELDNAME = "dynamicObjectTitle"; - @FieldDescribe("动态对象标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + dynamicObjectTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dynamicObjectTitle = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = null; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = null; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = null; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workTitle = null; - - public static final String dateTimeStr_FIELDNAME = "dateTimeStr"; - @FieldDescribe("操作时间") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + dateTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String dateTimeStr = null; - - public static final String dateTime_FIELDNAME = "dateTime"; - @FieldDescribe("操作时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + dateTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date dateTime = null; - - public static final String operatorName_FIELDNAME = "operatorName"; - @FieldDescribe("操作者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + operatorName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + operatorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String operatorName = null; - - public static final String targetName_FIELDNAME = "targetName"; - @FieldDescribe("目标者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetName = null; - - public static final String targetIdentity_FIELDNAME = "targetIdentity"; - @FieldDescribe("目标者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + targetIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + targetIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String targetIdentity = null; - - public static final String content_FIELDNAME = "content"; - @FieldDescribe("内容") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + content_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String content = null; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - public static final String viewUrl_FIELDNAME = "viewUrl"; - @FieldDescribe("访问链接") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + viewUrl_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String viewUrl = null; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - /** - * 获取工作动态类别：工作部署|工作确认|工作拆解|创建工作汇报|提交工作汇报|审阅工作汇报|创建问题请示|提交问题请示|审阅问题请示|交流 - * - * @return - */ - public String getDynamicType() { - return dynamicType; - } - - /** - * 设置工作动态类别：工作部署|工作确认|工作拆解|创建工作汇报|提交工作汇报|审阅工作汇报|创建问题请示|提交问题请示|审阅问题请示|交流 - * - * @param dynamicType - */ - public void setDynamicType(String dynamicType) { - this.dynamicType = dynamicType; - } - - /** - * 获取动态对象类别:中心工作|工作|工作汇报|问题请示|交流 - * - * @return - */ - public String getDynamicObjectType() { - return dynamicObjectType; - } - - /** - * 设置动态对象类别:中心工作|工作|工作汇报|问题请示|交流 - * - * @param dynamicObjectType - */ - public void setDynamicObjectType(String dynamicObjectType) { - this.dynamicObjectType = dynamicObjectType; - } - - /** - * 获取动态对象ID - * - * @return - */ - public String getDynamicObjectId() { - return dynamicObjectId; - } - - /** - * 设置动态对象ID - * - * @param dynamicObjectId - */ - public void setDynamicObjectId(String dynamicObjectId) { - this.dynamicObjectId = dynamicObjectId; - } - - /** - * 获取动态对象标题 - * - * @return - */ - public String getDynamicObjectTitle() { - return dynamicObjectTitle; - } - - /** - * 设置动态对象标题 - * - * @param dynamicObjectTitle - */ - public void setDynamicObjectTitle(String dynamicObjectTitle) { - this.dynamicObjectTitle = dynamicObjectTitle; - } - - /** - * 获取操作时间 - * - * @return - */ - public String getDateTimeStr() { - return dateTimeStr; - } - - /** - * 设置操作时间 - * - * @param dateTimeStr - */ - public void setDateTimeStr(String dateTimeStr) { - this.dateTimeStr = dateTimeStr; - } - - /** - * 获取操作时间 - * - * @return - */ - public Date getDateTime() { - return dateTime; - } - - /** - * 设置操作时间 - * - * @param dateTime - */ - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; - } - - /** - * 获取操作对象名称 - * - * @return - */ - public String getOperatorName() { - return operatorName; - } - - /** - * 设置操作对象名称 - * - * @param operatorName - */ - public void setOperatorName(String operatorName) { - this.operatorName = operatorName; - } - - /** - * 获取目标对象名称 - * - * @return - */ - public String getTargetName() { - return targetName; - } - - /** - * 设置目标对象名称 - * - * @param targetName - */ - public void setTargetName(String targetName) { - this.targetName = targetName; - } - - /** - * 获取操作描述 - * - * @return - */ - public String getContent() { - return content; - } - - /** - * 设置操作描述 - * - * @param content - */ - public void setContent(String content) { - this.content = content; - } - - /** - * 获取目标访问URL - * - * @return - */ - public String getViewUrl() { - return viewUrl; - } - - /** - * 设置目标访问URL - * - * @param viewUrl - */ - public void setViewUrl(String viewUrl) { - this.viewUrl = viewUrl; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getDescription() { - return description; - } - - /** - * 设置备注说明信息 - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * 获取中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getWorkTitle() { - return workTitle; - } - - /** - * 设置工作标题 - * - * @param workTitle - */ - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - public String getTargetIdentity() { - return targetIdentity; - } - - public void setTargetIdentity(String targetIdentity) { - this.targetIdentity = targetIdentity; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkPerson.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkPerson.java deleted file mode 100644 index 1b1ad0a13c..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkPerson.java +++ /dev/null @@ -1,683 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作人力资源管理表 - * - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkPerson.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkPerson.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkPerson extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkPerson.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerId = null; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String centerTitle = ""; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workTitle = ""; - - public static final String deployYear_FIELDNAME = "deployYear"; - @FieldDescribe("工作部署年份") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + deployYear_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deployYear_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployYear = ""; - - public static final String parentWorkId_FIELDNAME = "parentWorkId"; - @FieldDescribe("上级工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + parentWorkId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + parentWorkId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String parentWorkId = ""; - - public static final String workDateTimeType_FIELDNAME = "workDateTimeType"; - @FieldDescribe("工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报）") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workDateTimeType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workDateTimeType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workDateTimeType = "长期工作"; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String workLevel_FIELDNAME = "workLevel"; - @FieldDescribe("工作级别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - @Index(name = TABLE + IndexNameMiddle + workLevel_FIELDNAME) - private String workLevel = ""; - - public static final String workProcessStatus_FIELDNAME = "workProcessStatus"; - @FieldDescribe("工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + workProcessStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - @Index(name = TABLE + IndexNameMiddle + workProcessStatus_FIELDNAME) - private String workProcessStatus = "草稿"; - - public static final String isOverTime_FIELDNAME = "isOverTime"; - @FieldDescribe("工作是否已超期") - @Column(name = ColumnNamePrefix + isOverTime_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + isOverTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isOverTime = true; - - public static final String isCompleted_FIELDNAME = "isCompleted"; - @FieldDescribe("工作是否已完成") - @Column(name = ColumnNamePrefix + isCompleted_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + isCompleted_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean isCompleted = true; - - public static final String deployMonth_FIELDNAME = "deployMonth"; - @FieldDescribe("工作部署月份") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + deployMonth_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deployMonth_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployMonth = ""; - - public static final String workCreateDateStr_FIELDNAME = "workCreateDateStr"; - @FieldDescribe("工作创建日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workCreateDateStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workCreateDateStr = ""; - - public static final String deployDateStr_FIELDNAME = "deployDateStr"; - @FieldDescribe("工作部署日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + deployDateStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String deployDateStr = ""; - - public static final String completeDateLimit_FIELDNAME = "completeDateLimit"; - @FieldDescribe("工作完成日期") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + completeDateLimit_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date completeDateLimit = null; - - public static final String completeDateLimitStr_FIELDNAME = "completeDateLimitStr"; - @FieldDescribe("工作完成日期-字符串，显示用：yyyy-mm-dd") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + completeDateLimitStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String completeDateLimitStr = ""; - - public static final String employeeName_FIELDNAME = "employeeName"; - @FieldDescribe("员工姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + employeeName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + employeeName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String employeeName = null; - - public static final String employeeIdentity_FIELDNAME = "employeeIdentity"; - @FieldDescribe("员工身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + employeeIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + employeeIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String employeeIdentity = null; - - public static final String unitName_FIELDNAME = "unitName"; - @FieldDescribe("员工所属组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + unitName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + unitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String unitName = null; - - public static final String topUnitName_FIELDNAME = "topUnitName"; - @FieldDescribe("员工所属顶层组织名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + topUnitName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + topUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String topUnitName = null; - - public static final String processIdentity_FIELDNAME = "processIdentity"; - @FieldDescribe("员工处理身份：部署者，责任者，协助者，阅知者") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + processIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + processIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processIdentity = null; - - public static final String isDelegateTarget_FIELDNAME = "isDelegateTarget"; - @FieldDescribe("是否受托人") - @Column(name = ColumnNamePrefix + isDelegateTarget_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + isDelegateTarget_FIELDNAME) - @CheckPersist(allowEmpty = false) - private Boolean isDelegateTarget = false; - - public static final String viewTime_FIELDNAME = "viewTime"; - @FieldDescribe("阅读时间：员工阅读工作内容的时间，如果未读则为空字符串") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + viewTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String viewTime = ""; - - public static final String authorizeRecordId_FIELDNAME = "authorizeRecordId"; - @FieldDescribe("影响记录的授权信息ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + authorizeRecordId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + authorizeRecordId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String authorizeRecordId = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - public static final String discription_FIELDNAME = "discription"; - @FieldDescribe("备注说明") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + discription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String discription = null; - - public static final String recordType_FIELDNAME = "recordType"; - @FieldDescribe("记录的类别：中心工作|具体工作") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + recordType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String recordType = "具体工作"; - - /** - * 获取中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取员工姓名 - * - * @return - */ - public String getEmployeeName() { - return employeeName; - } - - /** - * 设置员工姓名 - * - * @param employeeName - */ - public void setEmployeeName(String employeeName) { - this.employeeName = employeeName; - } - - /** - * 获取员工所属组织名称 - * - * @return - */ - public String getUnitName() { - return unitName; - } - - /** - * 设置员工所属组织名称 - * - * @param unitName - */ - public void setUnitName(String unitName) { - this.unitName = unitName; - } - - /** - * 获取员工所属顶层组织名称 - * - * @return - */ - public String getTopUnitName() { - return topUnitName; - } - - /** - * 设置员工所属顶层组织名称 - * - * @param topUnitName - */ - public void setTopUnitName(String topUnitName) { - this.topUnitName = topUnitName; - } - - /** - * 获取员工处理身份：部署者，责任者，协助者，阅知者 - * - * @return - */ - public String getProcessIdentity() { - return processIdentity; - } - - /** - * 设置员工处理身份：部署者，责任者，协助者，阅知者 - * - * @param processIdentity - */ - public void setProcessIdentity(String processIdentity) { - this.processIdentity = processIdentity; - } - - /** - * 获取工作阅读时间：员工阅读工作内容的时间，如果未读则为空字符串 - * - * @return - */ - public String getViewTime() { - return viewTime; - } - - /** - * 设置工作阅读时间：员工阅读工作内容的时间，如果未读则为空字符串 - * - * @param viewTime - */ - public void setViewTime(String viewTime) { - this.viewTime = viewTime; - } - - /** - * 获取是否受托者 - * - * @return - */ - public Boolean getIsDelegateTarget() { - return isDelegateTarget; - } - - /** - * 设置是否受托者 - * - * @param isDelegateTarget - */ - public void setIsDelegateTarget(Boolean isDelegateTarget) { - this.isDelegateTarget = isDelegateTarget; - } - - /** - * 获取工作部署年份 - * - * @return - */ - public String getDeployYear() { - return deployYear; - } - - /** - * 设置工作部署年份 - * - * @param deployYear - */ - public void setDeployYear(String deployYear) { - this.deployYear = deployYear; - } - - /** - * 获取工作部署月份 - * - * @return - */ - public String getDeployMonth() { - return deployMonth; - } - - /** - * 设置工作部署月份 - * - * @param deployMonth - */ - public void setDeployMonth(String deployMonth) { - this.deployMonth = deployMonth; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取上级工作ID - * - * @return - */ - public String getParentWorkId() { - return parentWorkId; - } - - /** - * 设置上级工作ID - * - * @param parentWorkId - */ - public void setParentWorkId(String parentWorkId) { - this.parentWorkId = parentWorkId; - } - - /** - * 获取工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消 - * - * @return - */ - public String getWorkProcessStatus() { - return workProcessStatus; - } - - /** - * 设置工作处理状态：草稿|待确认|执行中|已超期|已完成|已撤消 - * - * @param workProcessStatus - */ - public void setWorkProcessStatus(String workProcessStatus) { - this.workProcessStatus = workProcessStatus; - } - - /** - * 获取工作类别：工作类别由工作类别配置表决定 - * - * @return - */ - public String getWorkType() { - return workType; - } - - /** - * 设置工作类别：工作类别由工作类别配置表决定 - * - * @param workType - */ - public void setWorkType(String workType) { - this.workType = workType; - } - - /** - * 获取工作级别：工作级别由工作级别配置表决定 - * - * @return - */ - public String getWorkLevel() { - return workLevel; - } - - /** - * 设置工作级别：工作级别由工作级别配置表决定 - * - * @param workLevel - */ - public void setWorkLevel(String workLevel) { - this.workLevel = workLevel; - } - - /** - * 获取工作是否已超期 - * - * @return - */ - public Boolean getIsOverTime() { - return isOverTime; - } - - /** - * 设置工作是否已超期 - * - * @param isOverTime - */ - public void setIsOverTime(Boolean isOverTime) { - this.isOverTime = isOverTime; - } - - /** - * 获取工作是否已完成 - * - * @return - */ - public Boolean getIsCompleted() { - return isCompleted; - } - - /** - * 设置工作是否已完成 - * - * @param isCompleted - */ - public void setIsCompleted(Boolean isCompleted) { - this.isCompleted = isCompleted; - } - - /** - * 获取工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - * - * @return - */ - public String getWorkDateTimeType() { - return workDateTimeType; - } - - /** - * 设置工作期限类型:短期工作(不需要自动启动定期汇报) | 长期工作（需要自动启动定期汇报） - * - * @param workDateTimeType - */ - public void setWorkDateTimeType(String workDateTimeType) { - this.workDateTimeType = workDateTimeType; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getWorkTitle() { - return workTitle; - } - - /** - * 设置工作标题 - * - * @param workTitle - */ - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - public String getEmployeeIdentity() { - return employeeIdentity; - } - - public void setEmployeeIdentity(String employeeIdentity) { - this.employeeIdentity = employeeIdentity; - } - - public String getAuthorizeRecordId() { - return authorizeRecordId; - } - - public void setAuthorizeRecordId(String authorizeRecordId) { - this.authorizeRecordId = authorizeRecordId; - } - - public String getDiscription() { - return discription; - } - - public void setDiscription(String discription) { - this.discription = discription; - } - - public String getDeployDateStr() { - return deployDateStr; - } - - public Date getCompleteDateLimit() { - return completeDateLimit; - } - - public String getCompleteDateLimitStr() { - return completeDateLimitStr; - } - - public void setDeployDateStr(String deployDateStr) { - this.deployDateStr = deployDateStr; - } - - public void setCompleteDateLimit(Date completeDateLimit) { - this.completeDateLimit = completeDateLimit; - } - - public void setCompleteDateLimitStr(String completeDateLimitStr) { - this.completeDateLimitStr = completeDateLimitStr; - } - - public String getRecordType() { - return recordType; - } - - public void setRecordType(String recordType) { - this.recordType = recordType; - } - - public String getWorkCreateDateStr() { - return workCreateDateStr; - } - - public void setWorkCreateDateStr(String workCreateDateStr) { - this.workCreateDateStr = workCreateDateStr; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportBaseInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportBaseInfo.java deleted file mode 100644 index d7b7b05a0b..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportBaseInfo.java +++ /dev/null @@ -1,844 +0,0 @@ -package com.x.okr.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.PersistentCollection; -import org.apache.openjpa.persistence.jdbc.ContainerTable; -import org.apache.openjpa.persistence.jdbc.ElementColumn; -import org.apache.openjpa.persistence.jdbc.ElementIndex; -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作汇报基础信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkReportBaseInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkReportBaseInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkReportBaseInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkReportBaseInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String submitTime_FIELDNAME = "submitTime"; - @FieldDescribe("汇报提交时间.") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + submitTime_FIELDNAME) - private Date submitTime; - - public static final String workTitle_FIELDNAME = "workTitle"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workTitle = null; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerTitle = null; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = null; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workId = null; - - public static final String workType_FIELDNAME = "workType"; - @FieldDescribe("工作类别") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + workType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workType = ""; - - public static final String title_FIELDNAME = "title"; - @FieldDescribe("工作汇报标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = null; - - public static final String shortTitle_FIELDNAME = "shortTitle"; - @FieldDescribe("工作汇报短标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortTitle_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String shortTitle = null; - - public static final String activityName_FIELDNAME = "activityName"; - @FieldDescribe("工作汇报当前环节") - @Column(length = JpaObject.length_64B, name = ColumnNamePrefix + activityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String activityName = "草稿"; - - public static final String reportCount_FIELDNAME = "reportCount"; - @FieldDescribe("工作汇报次序") - @Column(name = ColumnNamePrefix + reportCount_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer reportCount = 0; - - public static final String reporterName_FIELDNAME = "reporterName"; - @FieldDescribe("汇报者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reporterName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + reporterName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reporterName = null; - - public static final String reporterIdentity_FIELDNAME = "reporterIdentity"; - @FieldDescribe("汇报者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reporterIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + reporterIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reporterIdentity = null; - - public static final String reporterUnitName_FIELDNAME = "reporterUnitName"; - @FieldDescribe("汇报者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reporterUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reporterUnitName = null; - - public static final String reporterTopUnitName_FIELDNAME = "reporterTopUnitName"; - @FieldDescribe("汇报者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + reporterTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reporterTopUnitName = null; - - public static final String creatorName_FIELDNAME = "creatorName"; - @FieldDescribe("创建者姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorName_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + creatorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorName = null; - - public static final String creatorIdentity_FIELDNAME = "creatorIdentity"; - @FieldDescribe("创建者身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + creatorIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorIdentity = null; - - public static final String creatorUnitName_FIELDNAME = "creatorUnitName"; - @FieldDescribe("创建者所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorUnitName = null; - - public static final String creatorTopUnitName_FIELDNAME = "creatorTopUnitName"; - @FieldDescribe("创建者所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + creatorTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String creatorTopUnitName = null; - - public static final String isWorkCompleted_FIELDNAME = "isWorkCompleted"; - @FieldDescribe("工作是否已经完成") - @Column(name = ColumnNamePrefix + isWorkCompleted_FIELDNAME) - private Boolean isWorkCompleted = false; - - public static final String progressPercent_FIELDNAME = "progressPercent"; - @FieldDescribe("工作完成进度 % ") - @Column(name = ColumnNamePrefix + progressPercent_FIELDNAME) - private Integer progressPercent = 0; - - public static final String processStatus_FIELDNAME = "processStatus"; - @FieldDescribe("汇报处理状态：草稿|管理员督办|领导批示|已完成") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + processStatus_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processStatus = "草稿"; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("汇报信息状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String status = "正常"; - - public static final String processType_FIELDNAME = "processType"; - @FieldDescribe("汇报处理类别：审批|阅知") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + processType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processType = ""; - - public static final String currentProcessLevel_FIELDNAME = "currentProcessLevel"; - @FieldDescribe("当前处理级别") - @Column(name = ColumnNamePrefix + currentProcessLevel_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + currentProcessLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer currentProcessLevel = 0; - - public static final String needAdminAudit_FIELDNAME = "needAdminAudit"; - @FieldDescribe("是否需要工作管理员审核") - @Column(name = ColumnNamePrefix + needAdminAudit_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean needAdminAudit = false; - - public static final String needLeaderRead_FIELDNAME = "needLeaderRead"; - @FieldDescribe("是否需要领导批示") - @Column(name = ColumnNamePrefix + needLeaderRead_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Boolean needLeaderRead = false; - - public static final String workAdminName_FIELDNAME = "workAdminName"; - @FieldDescribe("工作管理员姓名") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workAdminName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workAdminName = null; - - public static final String workAdminIdentity_FIELDNAME = "workAdminIdentity"; - @FieldDescribe("工作管理员身份") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + workAdminIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workAdminIdentity = null; - - public static final String reportWorkflowType_FIELDNAME = "reportWorkflowType"; - @FieldDescribe("汇报工作流处理方式") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + reportWorkflowType_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String reportWorkflowType = null; - - public static final String description_FIELDNAME = "description"; - @FieldDescribe("说明备注") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + description_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String description = null; - - public static final String currentProcessorNameList_FIELDNAME = "currentProcessorNameList"; - @FieldDescribe("当前处理人姓名，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + currentProcessorNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + currentProcessorNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + currentProcessorNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + currentProcessorNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List currentProcessorNameList; - - public static final String currentProcessorIdentityList_FIELDNAME = "currentProcessorIdentityList"; - @FieldDescribe("当前处理人身份，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + currentProcessorIdentityList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + currentProcessorIdentityList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + currentProcessorIdentityList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + currentProcessorIdentityList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List currentProcessorIdentityList; - - public static final String currentProcessorUnitNameList_FIELDNAME = "currentProcessorUnitNameList"; - @FieldDescribe("当前处理人所属组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + currentProcessorUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + currentProcessorUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + currentProcessorUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + currentProcessorUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List currentProcessorUnitNameList; - - public static final String currentProcessorTopUnitNameList_FIELDNAME = "currentProcessorTopUnitNameList"; - @FieldDescribe("当前处理人所属顶层组织，多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + currentProcessorTopUnitNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + currentProcessorTopUnitNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + currentProcessorTopUnitNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + currentProcessorTopUnitNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List currentProcessorTopUnitNameList; - - public static final String readLeadersNameList_FIELDNAME = "readLeadersNameList"; - @FieldDescribe("批示领导姓名列表, 多值") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + readLeadersNameList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + readLeadersNameList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + readLeadersNameList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + readLeadersNameList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List readLeadersNameList; - - public static final String readLeadersIdentityList_FIELDNAME = "readLeadersIdentityList"; - @FieldDescribe("批示领导身份列表") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + readLeadersIdentityList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + readLeadersIdentityList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + readLeadersIdentityList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + readLeadersIdentityList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List readLeadersIdentityList; - - public static final String attachmentList_FIELDNAME = "attachmentList"; - @FieldDescribe("附件列表") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle + attachmentList_FIELDNAME, joinIndex = @Index(name = TABLE - + IndexNameMiddle + attachmentList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + attachmentList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + attachmentList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true) - private List attachmentList; - - /** - * 获取所属工作标题 - * - * @return - */ - public String getWorkTitle() { - return workTitle; - } - - /** - * 设置所属工作标题 - * - * @param workTitle - */ - public void setWorkTitle(String workTitle) { - this.workTitle = workTitle; - } - - /** - * 获取所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取所属工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置所属工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取汇报标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置汇报标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取汇报短标题 - * - * @return - */ - public String getShortTitle() { - return shortTitle; - } - - /** - * 设置汇报短标题 - * - * @param shortTitle - */ - public void setShortTitle(String shortTitle) { - this.shortTitle = shortTitle; - } - - /** - * 获取汇报次序 - * - * @return - */ - public Integer getReportCount() { - return reportCount; - } - - /** - * 设置汇报次序 - * - * @param reportCount - */ - public void setReportCount(Integer reportCount) { - this.reportCount = reportCount; - } - - /** - * 获取汇报者姓名 - * - * @return - */ - public String getReporterName() { - return reporterName; - } - - /** - * 设置汇报者姓名 - * - * @param reporterName - */ - public void setReporterName(String reporterName) { - this.reporterName = reporterName; - } - - /** - * 获取汇报者所属组织名称 - * - * @return - */ - public String getReporterUnitName() { - return reporterUnitName; - } - - /** - * 设置汇报者所属组织名称 - * - * @param reporterUnitName - */ - public void setReporterUnitName(String reporterUnitName) { - this.reporterUnitName = reporterUnitName; - } - - /** - * 获取汇报者所属顶层组织名称 - * - * @return - */ - public String getReporterTopUnitName() { - return reporterTopUnitName; - } - - /** - * 设置汇报者所属顶层组织名称 - * - * @param reporterTopUnitName - */ - public void setReporterTopUnitName(String reporterTopUnitName) { - this.reporterTopUnitName = reporterTopUnitName; - } - - /** - * 获取创建者姓名 - * - * @return - */ - public String getCreatorName() { - return creatorName; - } - - /** - * 设置创建者姓名 - * - * @param creatorName - */ - public void setCreatorName(String creatorName) { - this.creatorName = creatorName; - } - - /** - * 获取创建者所属组织名称 - * - * @return - */ - public String getCreatorUnitName() { - return creatorUnitName; - } - - /** - * 设置创建者所属组织名称 - * - * @param creatorUnitName - */ - public void setCreatorUnitName(String creatorUnitName) { - this.creatorUnitName = creatorUnitName; - } - - /** - * 获取创建者所属顶层组织名称 - * - * @return - */ - public String getCreatorTopUnitName() { - return creatorTopUnitName; - } - - /** - * 设置创建者所属顶层组织名称 - * - * @param creatorTopUnitName - */ - public void setCreatorTopUnitName(String creatorTopUnitName) { - this.creatorTopUnitName = creatorTopUnitName; - } - - /** - * 获取工作是否已经完成 - * - * @return - */ - public Boolean getIsWorkCompleted() { - return isWorkCompleted; - } - - /** - * 设置工作是否已经完成 - * - * @param isWorkCompleted - */ - public void setIsWorkCompleted(Boolean isWorkCompleted) { - this.isWorkCompleted = isWorkCompleted; - } - - public Integer getProgressPercent() { - return progressPercent; - } - - public void setProgressPercent(Integer progressPercent) { - this.progressPercent = progressPercent; - } - - /** - * 获取汇报信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置汇报信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 获取汇报处理类别：审批|阅知 - * - * @return - */ - public String getProcessType() { - return processType; - } - - /** - * 设置汇报处理类别：审批|阅知 - * - * @param processType - */ - public void setProcessType(String processType) { - this.processType = processType; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取汇报处理状态：草稿|审阅中|汇报人确认|已归档|已撤回 - * - * @return - */ - public String getProcessStatus() { - return processStatus; - } - - /** - * 设置汇报处理状态：草稿|审阅中|汇报人确认|已归档|已撤回 - * - * @param processStatus - */ - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - - /** - * 获取是否需要工作管理员审核 - * - * @return - */ - public Boolean getNeedAdminAudit() { - return needAdminAudit; - } - - /** - * 设置是否需要工作管理员审核 - * - * @param needAdminAudit - */ - public void setNeedAdminAudit(Boolean needAdminAudit) { - this.needAdminAudit = needAdminAudit; - } - - /** - * 获取工作管理员姓名 - * - * @return - */ - public String getWorkAdminName() { - return workAdminName; - } - - /** - * 设置工作管理员姓名 - * - * @param workAdminName - */ - public void setWorkAdminName(String workAdminName) { - this.workAdminName = workAdminName; - } - - public String getReporterIdentity() { - return reporterIdentity; - } - - public void setReporterIdentity(String reporterIdentity) { - this.reporterIdentity = reporterIdentity; - } - - public String getCreatorIdentity() { - return creatorIdentity; - } - - public void setCreatorIdentity(String creatorIdentity) { - this.creatorIdentity = creatorIdentity; - } - - public String getWorkAdminIdentity() { - return workAdminIdentity; - } - - public void setWorkAdminIdentity(String workAdminIdentity) { - this.workAdminIdentity = workAdminIdentity; - } - - public Boolean getNeedLeaderRead() { - return needLeaderRead; - } - - public void setNeedLeaderRead(Boolean needLeaderRead) { - this.needLeaderRead = needLeaderRead; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getReportWorkflowType() { - return reportWorkflowType; - } - - public void setReportWorkflowType(String reportWorkflowType) { - this.reportWorkflowType = reportWorkflowType; - } - - public String getActivityName() { - return activityName; - } - - public void setActivityName(String activityName) { - this.activityName = activityName; - } - - public Integer getCurrentProcessLevel() { - return currentProcessLevel; - } - - public void setCurrentProcessLevel(Integer currentProcessLevel) { - this.currentProcessLevel = currentProcessLevel; - } - - public String getWorkType() { - return workType; - } - - public void setWorkType(String workType) { - this.workType = workType; - } - - public Date getSubmitTime() { - return submitTime; - } - - public void setSubmitTime(Date submitTime) { - this.submitTime = submitTime; - } - - public List getAttachmentList() { - return attachmentList; - } - - public void setAttachmentList(List attachmentList) { - this.attachmentList = attachmentList; - } - - public List getReadLeadersNameList() { - return readLeadersNameList == null ? new ArrayList<>() : readLeadersNameList; - } - - public List getReadLeadersIdentityList() { - return readLeadersIdentityList == null ? new ArrayList<>() : readLeadersIdentityList; - } - - public void setReadLeadersNameList(List readLeadersNameList) { - this.readLeadersNameList = readLeadersNameList; - } - - public void setReadLeadersIdentityList(List readLeadersIdentityList) { - this.readLeadersIdentityList = readLeadersIdentityList; - } - - public List getCurrentProcessorNameList() { - return currentProcessorNameList == null ? new ArrayList<>() : currentProcessorNameList; - } - - public List getCurrentProcessorIdentityList() { - return currentProcessorIdentityList == null ? new ArrayList<>() : currentProcessorIdentityList; - } - - public List getCurrentProcessorUnitNameList() { - return currentProcessorUnitNameList == null ? new ArrayList<>() : currentProcessorUnitNameList; - } - - public List getCurrentProcessorTopUnitNameList() { - return currentProcessorTopUnitNameList == null ? new ArrayList<>() : currentProcessorTopUnitNameList; - } - - public void setCurrentProcessorNameList(List currentProcessorNameList) { - this.currentProcessorNameList = currentProcessorNameList; - } - - public void setCurrentProcessorIdentityList(List currentProcessorIdentityList) { - this.currentProcessorIdentityList = currentProcessorIdentityList; - } - - public void setCurrentProcessorUnitNameList(List currentProcessorUnitNameList) { - this.currentProcessorUnitNameList = currentProcessorUnitNameList; - } - - public void setCurrentProcessorTopUnitNameList(List currentProcessorTopUnitNameList) { - this.currentProcessorTopUnitNameList = currentProcessorTopUnitNameList; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportDetailInfo.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportDetailInfo.java deleted file mode 100644 index 8b54226552..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportDetailInfo.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作汇报详细信息管理实体类 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkReportDetailInfo.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkReportDetailInfo.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkReportDetailInfo extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkReportDetailInfo.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("所属中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = null; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("所属工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String workId = null; - - public static final String title_FIELDNAME = "title"; - @FieldDescribe("工作汇报标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = null; - - public static final String shortTitle_FIELDNAME = "shortTitle"; - @FieldDescribe("工作汇报短标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + shortTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String shortTitle = null; - - public static final String progressDescription_FIELDNAME = "progressDescription"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("截止当前完成情况") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + progressDescription_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String progressDescription = ""; - - public static final String workPlan_FIELDNAME = "workPlan"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("后续工作计划") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + workPlan_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workPlan = ""; - - public static final String memo_FIELDNAME = "memo"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("工作汇报备注信息") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + memo_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String memo = ""; - - public static final String workPointAndRequirements_FIELDNAME = "workPointAndRequirements"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("工作要点及需求") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + workPointAndRequirements_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workPointAndRequirements = ""; - - public static final String adminSuperviseInfo_FIELDNAME = "adminSuperviseInfo"; - @Lob - @FieldDescribe("管理员督办信息") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + adminSuperviseInfo_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String adminSuperviseInfo = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String status = "正常"; - - /** - * 获取汇报所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置汇报所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取汇报所属工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置汇报所属工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取汇报标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置汇报标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取汇报简要标题 - * - * @return - */ - public String getShortTitle() { - return shortTitle; - } - - /** - * 设置汇报简要标题 - * - * @param shortTitle - */ - public void setShortTitle(String shortTitle) { - this.shortTitle = shortTitle; - } - - /** - * 获取工作进展情况说明 - * - * @return - */ - public String getProgressDescription() { - return progressDescription; - } - - /** - * 设置工作进展情况说明 - * - * @param progressDescription - */ - public void setProgressDescription(String progressDescription) { - this.progressDescription = progressDescription; - } - - /** - * 获取下一步工作计划 - * - * @return - */ - public String getWorkPlan() { - return workPlan; - } - - /** - * 设置下一步工作计划 - * - * @param workPlan - */ - public void setWorkPlan(String workPlan) { - this.workPlan = workPlan; - } - - /** - * 获取备注说明信息 - * - * @return - */ - public String getMemo() { - return memo; - } - - /** - * 设置备注说明信息 - * - * @param memo - */ - public void setMemo(String memo) { - this.memo = memo; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - public String getWorkPointAndRequirements() { - return workPointAndRequirements; - } - - public void setWorkPointAndRequirements(String workPointAndRequirements) { - this.workPointAndRequirements = workPointAndRequirements; - } - - public String getAdminSuperviseInfo() { - return adminSuperviseInfo; - } - - public void setAdminSuperviseInfo(String adminSuperviseInfo) { - this.adminSuperviseInfo = adminSuperviseInfo; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportPersonLink.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportPersonLink.java deleted file mode 100644 index 35131827ef..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportPersonLink.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.x.okr.entity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作汇报处理链信息，记录工作汇报的处理人信息以及步骤信息，流程按处理人链一步一步执行 形成一个简易的流程控制过程 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkReportPersonLink.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkReportPersonLink.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkReportPersonLink extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkReportPersonLink.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ============================================================================= - * ===== 以上为 JpaObject 默认字段 - * ============================================================================= - * ===== - */ - - /* - * ============================================================================= - * ===== 以下为具体不同的业务及数据表字段要求 - * ============================================================================= - * ===== - */ - public static final String workReportId_FIELDNAME = "workReportId"; - @FieldDescribe("工作汇报ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workReportId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workReportId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workReportId = ""; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String title_FIELDNAME = "title"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerTitle = ""; - - public static final String processorName_FIELDNAME = "processorName"; - @FieldDescribe("处理人姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorName = ""; - - public static final String processorIdentity_FIELDNAME = "processorIdentity"; - @FieldDescribe("处理人身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + processorIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorIdentity = ""; - - public static final String processorUnitName_FIELDNAME = "processorUnitName"; - @FieldDescribe("处理人所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorUnitName = ""; - - public static final String processorTopUnitName_FIELDNAME = "processorTopUnitName"; - @FieldDescribe("处理人所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorTopUnitName = ""; - - public static final String processLevel_FIELDNAME = "processLevel"; - @FieldDescribe("处理层级次序") - @Column(name = ColumnNamePrefix + processLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer processLevel = 1; - - public static final String activityName_FIELDNAME = "activityName"; - @FieldDescribe("处理环节名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + activityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String activityName = ""; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("处理状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String status = "正常"; - - public static final String processStatus_FIELDNAME = "processStatus"; - @FieldDescribe("处理状态：待处理|处理中|已处理") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + processStatus_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String processStatus = "待处理"; - - /** - * 获取工作汇报信息ID - * - * @return - */ - public String getWorkReportId() { - return workReportId; - } - - /** - * 设置工作汇报信息ID - * - * @param workReportId - */ - public void setWorkReportId(String workReportId) { - this.workReportId = workReportId; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置工作标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取处理人姓名 - * - * @return - */ - public String getProcessorName() { - return processorName; - } - - /** - * 设置处理人姓名 - * - * @param processorName - */ - public void setProcessorName(String processorName) { - this.processorName = processorName; - } - - /** - * 获取处理人所属组织名称 - * - * @return - */ - public String getProcessorUnitName() { - return processorUnitName; - } - - /** - * 设置处理人所属组织名称 - * - * @param processorUnitName - */ - public void setProcessorUnitName(String processorUnitName) { - this.processorUnitName = processorUnitName; - } - - /** - * 获取处理人所属顶层组织名称 - * - * @return - */ - public String getProcessorTopUnitName() { - return processorTopUnitName; - } - - /** - * 设置处理人所属顶层组织名称 - * - * @param processorTopUnitName - */ - public void setProcessorTopUnitName(String processorTopUnitName) { - this.processorTopUnitName = processorTopUnitName; - } - - /** - * 获取处理层级次序 - * - * @return - */ - public Integer getProcessLevel() { - return processLevel; - } - - /** - * 设置处理层级次序 - * - * @param processLevel - */ - public void setProcessLevel(Integer processLevel) { - this.processLevel = processLevel; - } - - /** - * 获取处理环节名称 - * - * @return - */ - public String getActivityName() { - return activityName; - } - - /** - * 设置处理环节名称 - * - * @param activityName - */ - public void setActivityName(String activityName) { - this.activityName = activityName; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - public String getProcessorIdentity() { - return processorIdentity; - } - - public void setProcessorIdentity(String processorIdentity) { - this.processorIdentity = processorIdentity; - } - - public String getProcessStatus() { - return processStatus; - } - - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } - -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportProcessLog.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportProcessLog.java deleted file mode 100644 index ae0f57411a..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/OkrWorkReportProcessLog.java +++ /dev/null @@ -1,578 +0,0 @@ -package com.x.okr.entity; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - -import org.apache.openjpa.persistence.jdbc.Index; - -import com.x.base.core.entity.AbstractPersistenceProperties; -import com.x.base.core.entity.JpaObject; -import com.x.base.core.entity.SliceJpaObject; -import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.ContainerEntity; -import com.x.base.core.project.annotation.FieldDescribe; - -/** - * 工作汇报审阅记录 形成一个简易的流程控制过程 - * - * @author LIYI - */ -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) -@Entity -@Table(name = PersistenceProperties.OkrWorkReportProcessLog.table, uniqueConstraints = { - @UniqueConstraint(name = PersistenceProperties.OkrWorkReportProcessLog.table + JpaObject.IndexNameMiddle - + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, - JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) }) -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public class OkrWorkReportProcessLog extends SliceJpaObject { - - private static final long serialVersionUID = 3856138316794473794L; - private static final String TABLE = PersistenceProperties.OkrWorkReportProcessLog.table; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @FieldDescribe("数据库主键,自动生成.") - @Id - @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME) - private String id = createId(); - - public void onPersist() throws Exception { - } - /* - * ========================================================================= - * ========= 以上为 JpaObject 默认字段 - * ========================================================================= - * ========= - */ - - /* - * ========================================================================= - * ========= 以下为具体不同的业务及数据表字段要求 - * ========================================================================= - * ========= - */ - public static final String workReportId_FIELDNAME = "workReportId"; - @FieldDescribe("工作汇报ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workReportId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workReportId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workReportId = ""; - - public static final String reportTitle_FIELDNAME = "reportTitle"; - @FieldDescribe("工作汇报标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + reportTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String reportTitle = ""; - - public static final String workId_FIELDNAME = "workId"; - @FieldDescribe("工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workId_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String workId = ""; - - public static final String title_FIELDNAME = "title"; - @FieldDescribe("工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + title_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String title = ""; - - public static final String centerId_FIELDNAME = "centerId"; - @FieldDescribe("中心工作ID") - @Column(length = JpaObject.length_id, name = ColumnNamePrefix + centerId_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + centerId_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerId = ""; - - public static final String centerTitle_FIELDNAME = "centerTitle"; - @FieldDescribe("中心工作标题") - @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + centerTitle_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String centerTitle = ""; - - public static final String processorName_FIELDNAME = "processorName"; - @FieldDescribe("处理人姓名") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorName = ""; - - public static final String processorIdentity_FIELDNAME = "processorIdentity"; - @FieldDescribe("处理人身份") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + processorIdentity_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorIdentity = ""; - - public static final String processorUnitName_FIELDNAME = "processorUnitName"; - @FieldDescribe("处理人所属组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorUnitName = ""; - - public static final String processorTopUnitName_FIELDNAME = "processorTopUnitName"; - @FieldDescribe("处理人所属顶层组织") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + processorTopUnitName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processorTopUnitName = ""; - - public static final String processLevel_FIELDNAME = "processLevel"; - @FieldDescribe("处理层级次序") - @Column(name = ColumnNamePrefix + processLevel_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Integer processLevel = 1; - - public static final String activityName_FIELDNAME = "activityName"; - @FieldDescribe("处理环节名称") - @Column(length = AbstractPersistenceProperties.organization_name_length, name = ColumnNamePrefix - + activityName_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String activityName = ""; - - public static final String opinion_FIELDNAME = "opinion"; - @Lob - @Basic(fetch = FetchType.EAGER) - @FieldDescribe("处理意见") - @Column(length = JpaObject.length_2K, name = ColumnNamePrefix + opinion_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String opinion = ""; - - public static final String arriveTimeStr_FIELDNAME = "arriveTimeStr"; - @FieldDescribe("到达时间") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + arriveTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String arriveTimeStr = ""; - - public static final String arriveTime_FIELDNAME = "arriveTime"; - @FieldDescribe("到达时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + arriveTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date arriveTime = null; - - public static final String processTimeStr_FIELDNAME = "processTimeStr"; - @FieldDescribe("处理时间") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + processTimeStr_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String processTimeStr = ""; - - public static final String processTime_FIELDNAME = "processTime"; - @FieldDescribe("处理时间") - @Temporal(TemporalType.TIMESTAMP) - @Column(name = ColumnNamePrefix + processTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Date processTime = null; - - public static final String stayTime_FIELDNAME = "stayTime"; - @FieldDescribe("停留时长") - @Column(name = ColumnNamePrefix + stayTime_FIELDNAME) - @CheckPersist(allowEmpty = true) - private Long stayTime = 0L; - - public static final String decision_FIELDNAME = "decision"; - @FieldDescribe("决策方向：提交|退回") - @Column(length = JpaObject.length_32B, name = ColumnNamePrefix + decision_FIELDNAME) - @CheckPersist(allowEmpty = true) - private String decision = "提交"; - - public static final String processStatus_FIELDNAME = "processStatus"; - @FieldDescribe("处理状态：草稿|已生效") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + processStatus_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String processStatus = "草稿"; - - public static final String status_FIELDNAME = "status"; - @FieldDescribe("信息状态：正常|已删除") - @Column(length = JpaObject.length_16B, name = ColumnNamePrefix + status_FIELDNAME) - @CheckPersist(allowEmpty = false) - private String status = "正常"; - - /** - * 获取工作汇报信息ID - * - * @return - */ - public String getWorkReportId() { - return workReportId; - } - - /** - * 设置工作汇报信息ID - * - * @param workReportId - */ - public void setWorkReportId(String workReportId) { - this.workReportId = workReportId; - } - - /** - * 获取工作标题 - * - * @return - */ - public String getTitle() { - return title; - } - - /** - * 设置工作标题 - * - * @param title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取所属中心工作ID - * - * @return - */ - public String getCenterId() { - return centerId; - } - - /** - * 设置所属中心工作ID - * - * @param centerId - */ - public void setCenterId(String centerId) { - this.centerId = centerId; - } - - /** - * 获取中心工作标题 - * - * @return - */ - public String getCenterTitle() { - return centerTitle; - } - - /** - * 设置中心工作标题 - * - * @param centerTitle - */ - public void setCenterTitle(String centerTitle) { - this.centerTitle = centerTitle; - } - - /** - * 获取工作ID - * - * @return - */ - public String getWorkId() { - return workId; - } - - /** - * 设置工作ID - * - * @param workId - */ - public void setWorkId(String workId) { - this.workId = workId; - } - - /** - * 获取处理人姓名 - * - * @return - */ - public String getProcessorName() { - return processorName; - } - - /** - * 设置处理人姓名 - * - * @param processorName - */ - public void setProcessorName(String processorName) { - this.processorName = processorName; - } - - /** - * 获取处理人所属组织名称 - * - * @return - */ - public String getProcessorUnitName() { - return processorUnitName; - } - - /** - * 设置处理人所属组织名称 - * - * @param processorUnitName - */ - public void setProcessorUnitName(String processorUnitName) { - this.processorUnitName = processorUnitName; - } - - /** - * 获取处理人所属顶层组织名称 - * - * @return - */ - public String getProcessorTopUnitName() { - return processorTopUnitName; - } - - /** - * 设置处理人所属顶层组织名称 - * - * @param processorTopUnitName - */ - public void setProcessorTopUnitName(String processorTopUnitName) { - this.processorTopUnitName = processorTopUnitName; - } - - /** - * 获取处理层级次序 - * - * @return - */ - public Integer getProcessLevel() { - return processLevel; - } - - /** - * 设置处理层级次序 - * - * @param processLevel - */ - public void setProcessLevel(Integer processLevel) { - this.processLevel = processLevel; - } - - /** - * 获取处理环节名称 - * - * @return - */ - public String getActivityName() { - return activityName; - } - - /** - * 设置处理环节名称 - * - * @param activityName - */ - public void setActivityName(String activityName) { - this.activityName = activityName; - } - - /** - * 获取汇报标题 - * - * @return - */ - public String getReportTitle() { - return reportTitle; - } - - /** - * 设置汇报标题 - * - * @param reportTitle - */ - public void setReportTitle(String reportTitle) { - this.reportTitle = reportTitle; - } - - /** - * 获取处理意见 - * - * @return - */ - public String getOpinion() { - return opinion; - } - - /** - * 设置处理意见 - * - * @param opinion - */ - public void setOpinion(String opinion) { - this.opinion = opinion; - } - - /** - * 获取到达时间 - * - * @return - */ - public String getArriveTimeStr() { - return arriveTimeStr; - } - - /** - * 设置到达时间 - * - * @param arriveTimeStr - */ - public void setArriveTimeStr(String arriveTimeStr) { - this.arriveTimeStr = arriveTimeStr; - } - - /** - * 获取到达时间 - * - * @return - */ - public Date getArriveTime() { - return arriveTime; - } - - /** - * 设置到达时间 - * - * @param arriveTime - */ - public void setArriveTime(Date arriveTime) { - this.arriveTime = arriveTime; - } - - /** - * 获取处理时间 - * - * @return - */ - public String getProcessTimeStr() { - return processTimeStr; - } - - /** - * 设置处理时间 - * - * @param processTimeStr - */ - public void setProcessTimeStr(String processTimeStr) { - this.processTimeStr = processTimeStr; - } - - /** - * 获取处理时间 - * - * @return - */ - public Date getProcessTime() { - return processTime; - } - - /** - * 设置处理时间 - * - * @param processTime - */ - public void setProcessTime(Date processTime) { - this.processTime = processTime; - } - - /** - * 获取停留时长 - * - * @return - */ - public Long getStayTime() { - return stayTime; - } - - /** - * 设置停留时长 - * - * @param stayTime - */ - public void setStayTime(Long stayTime) { - this.stayTime = stayTime; - } - - /** - * 获取处理决策方向：提交|退回 - * - * @return - */ - public String getDecision() { - return decision; - } - - /** - * 设置处理决策方向：提交|退回 - * - * @param decision - */ - public void setDecision(String decision) { - this.decision = decision; - } - - /** - * 获取信息状态：正常|已删除 - * - * @return - */ - public String getStatus() { - return status; - } - - /** - * 设置信息状态：正常|已删除 - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - public String getProcessorIdentity() { - return processorIdentity; - } - - public void setProcessorIdentity(String processorIdentity) { - this.processorIdentity = processorIdentity; - } - - /** - * 获取处理状态：草稿|已生效 - * - * @return - */ - public String getProcessStatus() { - return processStatus; - } - - /** - * 设置处理状态：草稿|已生效 - * - * @param processStatus - */ - public void setProcessStatus(String processStatus) { - this.processStatus = processStatus; - } -} \ No newline at end of file diff --git a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/PersistenceProperties.java b/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/PersistenceProperties.java deleted file mode 100644 index 6fec371ba3..0000000000 --- a/o2server/x_okr_core_entity/src/main/java/com/x/okr/entity/PersistenceProperties.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.x.okr.entity; - -import com.x.base.core.entity.AbstractPersistenceProperties; - -public final class PersistenceProperties extends AbstractPersistenceProperties { - - public static class OkrStatisticReportContent { - /** - * 中心工作汇报情况统计信息实体类 - */ - public static final String table = "OKR_STATISTIC_REPORT_CONTENT"; - } - - public static class OkrStatisticReportStatus { - /** - * 所有工作汇报情况状态信息实体类 - */ - public static final String table = "OKR_STATISTIC_REPORT_STATUS"; - } - - public static class OkrCenterWorkInfo { - /** - * 中心工作信息管理表 - */ - public static final String table = "OKR_CENTERWORKINFO"; - } - - public static class OkrWorkBaseInfo { - /** - * 具体工作基础信息管理表 - */ - public static final String table = "OKR_WORKBASEINFO"; - } - - public static class OkrWorkDetailInfo { - /** - * 具体工作详细信息管理表 - */ - public static final String table = "OKR_WORKDETAILINFO"; - } - - public static class OkrWorkPerson { - /** - * 工作干系人关系管理表 - */ - public static final String table = "OKR_WORK_PERSON"; - } - - public static class OkrWorkReportBaseInfo { - /** - * 工作汇报信息关系管理表 - */ - public static final String table = "OKR_WORK_REPORTBASEINFO"; - } - - public static class OkrWorkReportDetailInfo { - /** - * 工作汇报详细信息管理表 - */ - public static final String table = "OKR_WORK_REPORTDETAILINFO"; - } - - public static class OkrWorkReportPersonLink { - /** - * 工作汇报审批链 - */ - public static final String table = "OKR_WORK_REPORT_PERSONLINK"; - } - - public static class OkrWorkProcessPersonLink { - /** - * 工作部署审批链 - */ - public static final String table = "OKR_WORK_PROCESS_PERSONLINK"; - } - - public static class OkrConfigWorkLevel { - /** - * 工作等级配置表 - */ - public static final String table = "OKR_CONFIG_WORKLEVEL"; - } - - public static class OkrConfigWorkType { - /** - * 工作类别配置表 - */ - public static final String table = "OKR_CONFIG_WORKTYPE"; - } - - public static class OkrWorkAuthorizeRecord { - /** - * 工作委托记录信息表 - */ - public static final String table = "OKR_WORK_AUTHORIZE_RECORD"; - } - - public static class OkrWorkReportProcessLog { - /** - * 工作汇报处理记录表 - */ - public static final String table = "OKR_WORK_REPORT_PROCESSLOG"; - } - - public static class OkrWorkDynamics { - /** - * 工作动态信息记录表 - */ - public static final String table = "OKR_WORKDYNAMICS"; - } - - public static class OkrConfigSecretary { - /** - * 领导秘书配置管理表 - */ - public static final String table = "OKR_CONFIG_SECRETARY"; - } - - public static class OkrConfigSystem { - /** - * 系统配置信息表 - */ - public static final String table = "OKR_CONFIG_SYSTEM"; - } - - public static class OkrTask { - /** - * 工作待办信息表 - */ - public static final String table = "OKR_TASK"; - } - - public static class OkrTaskHandled { - /** - * 工作已办信息表 - */ - public static final String table = "OKR_TASKHANDLED"; - } - - public static class OkrRead { - /** - * 工作待阅信息表 - */ - public static final String table = "OKR_READ"; - } - - public static class OkrReadHandled { - /** - * 工作已阅信息表 - */ - public static final String table = "OKR_READHANDLED"; - } - - public static class OkrAttachmentFileInfo { - /** - * 工作附件信息管理表 - */ - public static final String table = "OKR_ATTACHMENTFILEINFO"; - } - - public static class OkrWorkChat { - /** - * 人员权限配置信息表 - */ - public static final String table = "OKR_WORKCHAT"; - } - public static class OkrUserInfo { - /** - * 人员信息表 - */ - public static final String table = "OKR_USERINFO"; - } - - public static class OkrErrorSystemIdentityInfo { - /** - * 系统问题人员身份记录表 - */ - public static final String table = "OKR_ERRROIDENTITY"; - } - - public static class OkrErrorIdentityRecords { - /** - * 系统问题人员身份涉及数据记录表 - */ - public static final String table = "OKR_ERRROIDENTITYRECORDS"; - } - - public static class OkrWorkAppraiseInfo { - /** - * 工作考核信息表 - */ - public static final String table = "OKR_WORKAPPRAISEINFO"; - } -} \ No newline at end of file -- GitLab