diff --git a/aaaa b/aaaa new file mode 100644 index 000000000..8b7d988dd --- /dev/null +++ b/aaaa @@ -0,0 +1,415 @@ +c2a46f48d (HEAD -> zhaopeng) feat: 重新提交de修改 + src/com/api/salary/listener/InitListener.java | 53 - + .../api/salary/web/AddUpDeductionController.java | 9 - + .../api/salary/web/AddUpSituationController.java | 8 - + src/com/api/salary/web/AttendQuoteController.java | 8 - + src/com/api/salary/web/AuthController.java | 8 - + src/com/api/salary/web/ExtEmpController.java | 8 - + src/com/api/salary/web/MaintainerController.java | 9 - + .../api/salary/web/MySalaryShowSetController.java | 13 - + .../api/salary/web/OtherDeductionController.java | 8 - + src/com/api/salary/web/ProcessController.java | 8 - + src/com/api/salary/web/PushController.java | 8 - + src/com/api/salary/web/SIAccountController.java | 13 - + .../salary/web/SIArchiveActionAPIController.java | 14 - + src/com/api/salary/web/SIArchivesController.java | 13 - + src/com/api/salary/web/SICategoryController.java | 13 - + src/com/api/salary/web/SIExportController.java | 13 - + src/com/api/salary/web/SIReportController.java | 16 - + src/com/api/salary/web/SISchemeController.java | 13 - + src/com/api/salary/web/SalaryAcctController.java | 8 - + .../web/SalaryArchiveActionAPIController.java | 10 - + .../api/salary/web/SalaryArchiveController.java | 8 - + src/com/api/salary/web/SalaryBillController.java | 7 - + src/com/api/salary/web/SalaryCommonController.java | 7 - + src/com/api/salary/web/SalaryFieldController.java | 7 - + .../api/salary/web/SalaryFormulaController.java | 7 - + src/com/api/salary/web/SalaryItemController.java | 7 - + .../api/salary/web/SalaryProgressController.java | 7 - + .../api/salary/web/SalarySendRangeController.java | 8 - + src/com/api/salary/web/SalarySobController.java | 15 - + .../web/SalaryStatisticsDimensionController.java | 9 - + .../web/SalaryStatisticsEchartsController.java | 8 - + .../web/SalaryStatisticsEmployeeController.java | 8 - + .../salary/web/SalaryStatisticsItemController.java | 9 - + .../salary/web/SalaryStatisticsPushController.java | 8 - + .../web/SalaryStatisticsReportController.java | 9 - + .../salary/web/SalarySystemConfigController.java | 8 - + .../salary/web/SpecialAddDeductionController.java | 8 - + src/com/api/salary/web/TaxAgentController.java | 7 - + .../api/salary/web/TaxDeclarationController.java | 7 - + src/com/api/salary/web/TaxRateController.java | 7 - + .../api/salary/web/VariableArchiveController.java | 8 - + src/com/api/salary/web/VariableItemController.java | 8 - + .../salary/action/BatEditSalaryExcelAction.java | 112 - + .../action/CheckBatEditSalaryExcelAction.java | 111 - + .../salary/action/CheckEditSIArchiveAction.java | 153 - + .../salary/action/CheckEditSalaryAction.java | 147 - + .../salary/action/CheckInitSalaryAction.java | 208 - + .../action/CheckStayAddToPaySIArchiveAction.java | 161 - + .../action/CheckStayDelToStopSIArchiveAction.java | 160 - + .../salary/action/CheckStopSalaryAction.java | 177 - + .../salary/action/CopyToPaySIArchiveAction.java | 170 - + .../engine/salary/action/EditSIArchiveAction.java | 152 - + src/com/engine/salary/action/EditSalaryAction.java | 147 - + .../salary/action/EditToPaySIArchiveAction.java | 198 - + .../salary/action/EditToStopSIArchiveAction.java | 201 - + .../salary/action/FileSalaryAcctRecordAction.java | 83 - + src/com/engine/salary/action/InitSalaryAction.java | 216 - + src/com/engine/salary/action/RehireAction.java | 261 - + .../salary/action/SalaryAcctFileByIdAction.java | 64 - + src/com/engine/salary/action/SendSalaryAction.java | 136 - + .../salary/action/StayAddToPaySIArchiveAction.java | 171 - + .../action/StayDelToStopSIArchiveAction.java | 196 - + src/com/engine/salary/action/StopSalaryAction.java | 203 - + .../salary/action/UpdateSISchemeDetailAction.java | 272 - + .../action/updateSalaryApprovalStatusAction.java | 78 - + src/com/engine/salary/annotation/Auth.java | 29 - + src/com/engine/salary/annotation/AuthField.java | 22 - + src/com/engine/salary/annotation/AuthOpt.java | 20 - + src/com/engine/salary/annotation/Encrypt.java | 20 - + src/com/engine/salary/annotation/I18n.java | 20 - + .../engine/salary/annotation/SalaryFormulaVar.java | 27 - + src/com/engine/salary/annotation/SalaryTable.java | 69 - + .../salary/annotation/SalaryTableColumn.java | 34 - + .../salary/annotation/SalaryTableOperate.java | 27 - + src/com/engine/salary/annotation/TableTitle.java | 13 - + src/com/engine/salary/biz/AddUpDeductionBiz.java | 171 - + src/com/engine/salary/biz/AddUpSituationBiz.java | 191 - + src/com/engine/salary/biz/AttendQuoteBiz.java | 66 - + src/com/engine/salary/biz/AttendQuoteDataBiz.java | 67 - + .../engine/salary/biz/AttendQuoteDataValueBiz.java | 93 - + src/com/engine/salary/biz/AttendQuoteFieldBiz.java | 108 - + .../salary/biz/AttendQuoteFieldSettingBiz.java | 46 - + src/com/engine/salary/biz/EmployBiz.java | 247 - + src/com/engine/salary/biz/OtherDeductionBiz.java | 226 - + src/com/engine/salary/biz/SIAccountBiz.java | 2683 -------- + src/com/engine/salary/biz/SIArchivesBiz.java | 2653 -------- + src/com/engine/salary/biz/SICategoryBiz.java | 184 - + src/com/engine/salary/biz/SISchemeBiz.java | 497 -- + src/com/engine/salary/biz/SalaryArchiveBiz.java | 66 - + .../salary/biz/SalaryArchiveDimissionBiz.java | 42 - + .../engine/salary/biz/SalaryArchiveItemBiz.java | 251 - + .../salary/biz/SalaryArchiveTaxAgentBiz.java | 93 - + src/com/engine/salary/biz/SalaryItemBiz.java | 157 - + src/com/engine/salary/biz/SalarySendBiz.java | 121 - + src/com/engine/salary/biz/SalarySendInfoBiz.java | 148 - + .../engine/salary/biz/SalarySendRangeObjBiz.java | 83 - + .../engine/salary/biz/SalarySobAdjustRuleBiz.java | 50 - + src/com/engine/salary/biz/SalarySobBiz.java | 86 - + .../engine/salary/biz/SalarySobCheckRuleBiz.java | 109 - + .../engine/salary/biz/SalarySobDefaultItemBiz.java | 22 - + .../salary/biz/SalarySobDefaultItemGroupBiz.java | 23 - + .../engine/salary/biz/SalarySobEmpFieldBiz.java | 88 - + src/com/engine/salary/biz/SalarySobItemBiz.java | 134 - + .../engine/salary/biz/SalarySobItemGroupBiz.java | 94 - + .../engine/salary/biz/SalarySobItemHideBiz.java | 66 - + src/com/engine/salary/biz/SalarySobRangeBiz.java | 84 - + src/com/engine/salary/biz/SalaryTemplateBiz.java | 143 - + .../engine/salary/biz/SpecialAddDeductionBiz.java | 223 - + src/com/engine/salary/biz/SubCompanyBiz.java | 48 - + src/com/engine/salary/biz/SysSalaryItemBiz.java | 51 - + src/com/engine/salary/biz/TaxAgentBiz.java | 43 - + src/com/engine/salary/biz/TaxRateBiz.java | 323 - + src/com/engine/salary/biz/TaxRateDetailBiz.java | 48 - + src/com/engine/salary/cache/SalaryCacheKey.java | 76 - + src/com/engine/salary/cache/SalaryModuleKey.java | 16 - + .../salary/cmd/TaxRate/TaxRateDeleteCmd.java | 45 - + .../salary/cmd/TaxRate/TaxRateGetFormCmd.java | 37 - + .../engine/salary/cmd/TaxRate/TaxRateListCmd.java | 106 - + .../engine/salary/cmd/TaxRate/TaxRateSaveCmd.java | 36 - + .../salary/cmd/TaxRate/TaxRateUpdateCmd.java | 33 - + .../salary/cmd/siarchives/SIArchivesTipsCmd.java | 47 - + .../cmd/sicategory/SICategoryGetFormCmd.java | 86 - + .../salary/cmd/sicategory/SICategoryInsertCmd.java | 39 - + .../salary/cmd/sicategory/SICategoryListCmd.java | 53 - + .../salary/cmd/sicategory/SICategoryUpdateCmd.java | 39 - + .../sicategory/SICategoryUpdateStatusByIdCmd.java | 40 - + .../salary/cmd/sischeme/SISchemeCopyCmd.java | 40 - + .../salary/cmd/sischeme/SISchemeDeleteCmd.java | 74 - + .../salary/cmd/sischeme/SISchemeGetFormCmd.java | 48 - + .../salary/cmd/sischeme/SISchemeInsertCmd.java | 40 - + .../salary/cmd/sischeme/SISchemeListCmd.java | 61 - + .../salary/cmd/sischeme/SISchemeUpdateCmd.java | 40 - + src/com/engine/salary/common/BaseQueryParam.java | 33 - + src/com/engine/salary/common/LocalDateRange.java | 36 - + src/com/engine/salary/common/SalaryContext.java | 38 - + src/com/engine/salary/component/Page.java | 170 - + src/com/engine/salary/component/PageInfo.java | 380 -- + .../engine/salary/component/PageInterceptor.java | 176 - + src/com/engine/salary/component/ReflectUtil.java | 174 - + .../engine/salary/component/SalaryWeaTable.java | 116 - + src/com/engine/salary/component/WeaFormOption.java | 75 - + .../salary/component/WeaTableColumnGroup.java | 68 - + src/com/engine/salary/config/SalaryElogConfig.java | 325 - + .../salary/config/SalaryPermissionConfig.java | 194 - + .../salary/constant/HrmSalaryPayrollConf.java | 15 - + .../salary/constant/SalaryArchiveConstant.java | 36 - + .../engine/salary/constant/SalaryAuthConstant.java | 18 - + .../engine/salary/constant/SalaryBillConstant.java | 30 - + .../constant/SalaryDefaultTenantConstant.java | 14 - + .../constant/SalaryFormulaFieldConstant.java | 30 - + .../engine/salary/constant/SalaryItemConstant.java | 44 - + .../constant/SalaryItemDataTypeConstant.java | 21 - + .../SalaryTemplateSalaryItemSetGroupConstant.java | 25 - + .../constant/SalrayCheckSecondAuthConstant.java | 46 - + .../constant/TaxAgentPermissionConstant.java | 24 - + .../constant/TaxDeclarationDataIndexConstant.java | 278 - + .../salary/constant/TaxRateDataIndexConstant.java | 56 - + src/com/engine/salary/constant/des.json | 1552 ----- + src/com/engine/salary/encrypt/AESEncryptUtil.java | 149 - + src/com/engine/salary/encrypt/EncryptSetting.java | 16 - + src/com/engine/salary/encrypt/EncryptUtil.java | 167 - + src/com/engine/salary/encrypt/TestEncrypt.java | 18 - + .../salary/entity/agency/bo/PaymentAgencyBO.java | 57 - + .../entity/agency/dto/PaymentAgencyFormDTO.java | 58 - + .../entity/agency/dto/PaymentAgencyListDTO.java | 55 - + .../salary/entity/agency/po/PaymentAgencyPO.java | 56 - + .../engine/salary/entity/auth/dto/AuthDataDTO.java | 38 - + .../salary/entity/auth/dto/AuthLimitDTO.java | 18 - + .../salary/entity/auth/dto/AuthMemberDTO.java | 26 - + .../engine/salary/entity/auth/dto/AuthOptDTO.java | 77 - + .../engine/salary/entity/auth/dto/AuthRoleDTO.java | 53 - + .../salary/entity/auth/dto/AuthRoleDataDTO.java | 32 - + .../salary/entity/auth/dto/AuthRoleEmpDTO.java | 32 - + .../engine/salary/entity/auth/dto/AuthTreeDTO.java | 62 - + src/com/engine/salary/entity/auth/dto/EmpOpt.java | 19 - + src/com/engine/salary/entity/auth/dto/Opt.java | 15 - + .../salary/entity/auth/dto/PermissionDTO.java | 5 - + .../engine/salary/entity/auth/dto/RoleLimit.java | 19 - + .../engine/salary/entity/auth/dto/SobOptAuth.java | 19 - + .../salary/entity/auth/dto/TaxEmpOptAuth.java | 19 - + .../engine/salary/entity/auth/dto/TaxOptAuth.java | 19 - + .../entity/auth/param/AuthDataQueryParam.java | 20 - + .../entity/auth/param/AuthDataSaveParam.java | 41 - + .../entity/auth/param/AuthMemberQueryParam.java | 20 - + .../entity/auth/param/AuthMemberSaveParam.java | 29 - + .../salary/entity/auth/param/AuthOptSaveParam.java | 26 - + .../entity/auth/param/AuthRoleListQueryParam.java | 59 - + .../entity/auth/param/AuthRoleSaveParam.java | 44 - + .../salary/entity/auth/param/AuthSyncParam.java | 17 - + .../entity/auth/param/AuthTreeQueryParam.java | 28 - + .../engine/salary/entity/auth/po/AuthDataPO.java | 92 - + .../engine/salary/entity/auth/po/AuthMemberPO.java | 71 - + .../engine/salary/entity/auth/po/AuthOptPO.java | 75 - + .../salary/entity/auth/po/AuthResourcePO.java | 83 - + .../salary/entity/auth/po/AuthRoleDataPO.java | 69 - + .../salary/entity/auth/po/AuthRoleEmpPO.java | 61 - + .../engine/salary/entity/auth/po/AuthRolePO.java | 69 - + .../engine/salary/entity/auth/vo/Permission.java | 40 - + .../engine/salary/entity/config/SalaryConfig.java | 49 - + .../entity/datacollection/AddUpDeduction.java | 139 - + .../entity/datacollection/AddUpSituation.java | 239 - + .../datacollection/DataCollectionEmployee.java | 140 - + .../datacollection/bo/AttendQuoteDataBO.java | 71 - + .../datacollection/bo/AttendQuoteFieldBO.java | 106 - + .../entity/datacollection/bo/DataCollectionBO.java | 52 - + .../datacollection/bo/VariableArchiveBO.java | 281 - + .../datacollection/bo/VariableArchiveExcelBO.java | 314 - + .../datacollection/dto/AddUpDeductionDTO.java | 170 - + .../dto/AddUpDeductionRecordDTO.java | 131 - + .../datacollection/dto/AddUpSituationDTO.java | 222 - + .../dto/AddUpSituationRecordDTO.java | 177 - + .../datacollection/dto/AttendQuoteDataBaseDTO.java | 61 - + .../datacollection/dto/AttendQuoteDataDTO.java | 29 - + .../dto/AttendQuoteDataValueDTO.java | 27 - + .../dto/AttendQuoteFieldFormDTO.java | 40 - + .../dto/AttendQuoteFieldListDTO.java | 63 - + .../dto/AttendQuoteFieldSettingFieldListDTO.java | 33 - + .../dto/AttendQuoteFieldSettingListDTO.java | 32 - + .../datacollection/dto/AttendQuoteListDTO.java | 84 - + .../datacollection/dto/OtherDeductionListDTO.java | 128 - + .../dto/OtherDeductionRecordDTO.java | 101 - + .../dto/SpecialAddDeductionListDTO.java | 140 - + .../dto/SpecialAddDeductionRecordDTO.java | 103 - + .../datacollection/dto/VariableArchiveItemDTO.java | 33 - + .../datacollection/dto/VariableArchiveListDTO.java | 104 - + .../datacollection/dto/VariableItemListDTO.java | 37 - + .../param/AddDeductionAutoAddParam.java | 24 - + .../param/AddUpDeductionImportParam.java | 31 - + .../param/AddUpDeductionQueryParam.java | 73 - + .../param/AddUpDeductionRecordDeleteParam.java | 29 - + .../param/AddUpDeductionRecordParam.java | 67 - + .../param/AddUpSituationDeleteParam.java | 29 - + .../param/AddUpSituationImportParam.java | 29 - + .../datacollection/param/AddUpSituationParam.java | 101 - + .../param/AddUpSituationQueryParam.java | 68 - + .../param/AttendModuleSettingFieldParam.java | 27 - + .../param/AttendQuoteCheckOperationParam.java | 35 - + .../param/AttendQuoteDataEditParam.java | 32 - + .../param/AttendQuoteDataExportTemplateParam.java | 29 - + .../param/AttendQuoteDataImportParam.java | 36 - + .../param/AttendQuoteDataQueryParam.java | 48 - + .../param/AttendQuoteDataSaveParam.java | 28 - + .../param/AttendQuoteDataSyncParam.java | 52 - + .../param/AttendQuoteFieldQueryParam.java | 62 - + .../param/AttendQuoteFieldSaveParam.java | 52 - + .../param/AttendQuoteFieldSettingQueryParam.java | 29 - + .../param/AttendQuoteFieldSettingRecoverParam.java | 28 - + .../param/AttendQuoteFieldSettingSaveParam.java | 28 - + .../param/AttendQuoteQueryParam.java | 34 - + .../param/OtherDeductionExtendLastParam.java | 21 - + .../param/OtherDeductionImportParam.java | 31 - + .../datacollection/param/OtherDeductionParam.java | 63 - + .../param/OtherDeductionQueryParam.java | 65 - + .../param/QuerySalaryCycleAndAttendCycleParam.java | 25 - + .../param/SpecialAddDeductionImportParam.java | 28 - + .../param/SpecialAddDeductionParam.java | 80 - + .../param/SpecialAddDeductionQueryParam.java | 60 - + .../SpecialAddDeductionRecordDeleteParam.java | 25 - + .../param/VariableArchiveImportHandleParam.java | 104 - + .../param/VariableArchiveQueryParam.java | 52 - + .../param/VariableArchiveSaveParam.java | 38 - + .../param/VariableItemQueryParam.java | 31 - + .../param/VariableItemSaveParam.java | 41 - + .../datacollection/po/AttendQuoteDataPO.java | 64 - + .../datacollection/po/AttendQuoteDataValuePO.java | 68 - + .../datacollection/po/AttendQuoteFieldPO.java | 93 - + .../po/AttendQuoteFieldSettingPO.java | 56 - + .../entity/datacollection/po/AttendQuotePO.java | 112 - + .../entity/datacollection/po/OtherDeductionPO.java | 123 - + .../datacollection/po/SpecialAddDeductionPO.java | 121 - + .../datacollection/po/VariableArchiveItemPO.java | 78 - + .../datacollection/po/VariableArchivePO.java | 51 - + .../entity/datacollection/po/VariableItemPO.java | 58 - + .../engine/salary/entity/extemp/dto/ExtEmpDTO.java | 57 - + .../entity/extemp/param/ExtEmpImportParam.java | 22 - + .../entity/extemp/param/ExtEmpQueryParam.java | 27 - + .../entity/extemp/param/ExtEmpSaveParam.java | 101 - + .../engine/salary/entity/extemp/po/ExtEmpPO.java | 192 - + src/com/engine/salary/entity/hrm/DeptInfo.java | 35 - + src/com/engine/salary/entity/hrm/HrmStatus.java | 16 - + src/com/engine/salary/entity/hrm/JobCallInfo.java | 32 - + src/com/engine/salary/entity/hrm/PositionInfo.java | 32 - + .../engine/salary/entity/hrm/SubCompanyInfo.java | 30 - + .../entity/hrm/dto/EmployeeInfoExpandDTO.java | 53 - + .../engine/salary/entity/hrm/dto/FieldSetting.java | 35 - + .../engine/salary/entity/hrm/dto/HrmInfoDTO.java | 26 - + .../salary/entity/hrm/param/HrmQueryParam.java | 30 - + .../entity/hrm/po/ExpandFieldSettingsPO.java | 74 - + .../engine/salary/entity/hrm/po/HrmSnapshotPO.java | 434 -- + .../entity/process/dto/SalaryAdjustmentDTO.java | 18 - + .../engine/salary/entity/progress/ProgressDTO.java | 66 - + .../salary/entity/push/dto/PushRecordDTO.java | 116 - + .../entity/push/dto/PushRecordDetailDTO.java | 94 - + .../salary/entity/push/dto/PushSettingDTO.java | 61 - + .../salary/entity/push/dto/PushSettingItemDTO.java | 65 - + .../salary/entity/push/param/CreatePushParam.java | 29 - + .../engine/salary/entity/push/param/PushParam.java | 20 - + .../push/param/PushSettingItemQueryParam.java | 22 - + .../push/param/PushSettingItemSaveParam.java | 71 - + .../entity/push/param/PushSettingQueryParam.java | 28 - + .../entity/push/param/PushSettingSaveParam.java | 59 - + .../push/param/RecordDetailListQueryParam.java | 22 - + .../entity/push/param/RecordListQueryParam.java | 17 - + .../salary/entity/push/param/WithdrawParam.java | 20 - + .../entity/push/param/WithdrawPushParam.java | 29 - + .../salary/entity/push/po/PushRecordDetailPO.java | 96 - + .../engine/salary/entity/push/po/PushRecordPO.java | 123 - + .../salary/entity/push/po/PushSettingItemPO.java | 103 - + .../salary/entity/push/po/PushSettingPO.java | 93 - + .../entity/report/bo/SalaryAcctResultReportBO.java | 100 - + .../entity/report/po/SalaryAcctResultReportPO.java | 98 - + .../salary/entity/salaryBill/bo/SalaryBillBO.java | 964 --- + .../entity/salaryBill/bo/SalaryBillItemNameBO.java | 30 - + .../entity/salaryBill/bo/SalarySendRangeBO.java | 186 - + .../entity/salaryBill/bo/SalaryTemplateBO.java | 192 - + .../entity/salaryBill/dto/MySalaryShowSetDTO.java | 40 - + .../salaryBill/dto/SalaryBaseSetFormDTO.java | 38 - + .../salaryBill/dto/SalaryBillAckFeedbackDTO.java | 46 - + .../salaryBill/dto/SalaryBillItemNameDTO.java | 30 - + .../entity/salaryBill/dto/SalaryBillSendDTO.java | 99 - + .../salaryBill/dto/SalaryBillWatermarkDTO.java | 37 - + .../salaryBill/dto/SalaryMySalaryBillListDTO.java | 40 - + .../salaryBill/dto/SalarySendBaseInfoDTO.java | 54 - + .../entity/salaryBill/dto/SalarySendCheckDTO.java | 28 - + .../salaryBill/dto/SalarySendDetailListDTO.java | 58 - + .../salaryBill/dto/SalarySendInfoListDTO.java | 82 - + .../entity/salaryBill/dto/SalarySendListDTO.java | 154 - + .../salaryBill/dto/SalarySendRangeListDTO.java | 36 - + .../salaryBill/dto/SalarySendRangeObjDTO.java | 44 - + .../salaryBill/dto/SalarySendUserInfoDTO.java | 38 - + .../salaryBill/dto/SalaryTemplateBaseFormDTO.java | 27 - + .../salaryBill/dto/SalaryTemplateBaseSetDTO.java | 106 - + .../salaryBill/dto/SalaryTemplateListDTO.java | 72 - + .../dto/SalaryTemplateReplenishFormDTO.java | 33 - + .../salaryBill/dto/SalaryTemplateSMSDTO.java | 23 - + .../salaryBill/dto/SalaryTemplateSMSSetDTO.java | 26 - + .../dto/SalaryTemplateSalaryItemListDTO.java | 40 - + .../dto/SalaryTemplateSalaryItemSetListDTO.java | 31 - + .../salaryBill/dto/SalaryTemplateShowFormDTO.java | 38 - + .../salaryBill/dto/SalaryTemplateShowSetDTO.java | 58 - + .../dto/salaryBillViewingLimitSetting.java | 38 - + .../salaryBill/param/ReplenishFormQueryParam.java | 22 - + .../entity/salaryBill/param/SMSCodeCheckParam.java | 32 - + .../entity/salaryBill/param/SMSCodeSendParam.java | 28 - + .../salaryBill/param/SalaryBaseSetSaveParam.java | 62 - + .../salaryBill/param/SalaryBillGetTokenParam.java | 26 - + .../param/SalaryBillItemDetailQueryParam.java | 36 - + .../param/SalaryBillItemNameSaveParam.java | 46 - + .../salaryBill/param/SalaryBillQueryParam.java | 38 - + .../param/SalaryBillSalaryGroupQueryParam.java | 31 - + .../param/SalaryBillSalaryItemQueryParam.java | 26 - + .../salaryBill/param/SalaryExportPdfParam.java | 26 - + .../salaryBill/param/SalaryPreviewParam.java | 32 - + .../param/SalarySendDetailListQueryParam.java | 79 - + .../param/SalarySendDetailQueryParam.java | 81 - + .../salaryBill/param/SalarySendGrantParam.java | 45 - + .../salaryBill/param/SalarySendInfoQueryParam.java | 94 - + .../salaryBill/param/SalarySendQueryParam.java | 39 - + .../param/SalarySendRangeQueryParam.java | 30 - + .../salaryBill/param/SalarySendRangeSaveParam.java | 122 - + .../salaryBill/param/SalarySendWithdrawParam.java | 33 - + .../salaryBill/param/SalaryTemplateCopyParam.java | 36 - + .../param/SalaryTemplateDefaultUseParam.java | 27 - + .../salaryBill/param/SalaryTemplateQueryParam.java | 28 - + .../salaryBill/param/SalaryTemplateSaveParam.java | 180 - + .../entity/salaryBill/po/SalaryBillItemNamePO.java | 71 - + .../salaryBill/po/SalaryBillWatermarkPO.java | 69 - + .../entity/salaryBill/po/SalarySendInfoPO.java | 124 - + .../salary/entity/salaryBill/po/SalarySendPO.java | 107 - + .../entity/salaryBill/po/SalarySendRangeObj.java | 71 - + .../entity/salaryBill/po/SalarySendRangePO.java | 57 - + .../entity/salaryBill/po/SalaryTemplatePO.java | 244 - + .../salaryacct/bo/CalculateFormulaVarBO.java | 648 -- + .../entity/salaryacct/bo/ExpressFormulaBO.java | 116 - + .../salaryacct/bo/SalaryAcctCalculateBO.java | 140 - + .../bo/SalaryAcctCalculatePriorityBO.java | 248 - + .../entity/salaryacct/bo/SalaryAcctCheckBO.java | 81 - + .../entity/salaryacct/bo/SalaryAcctConfig.java | 84 - + .../salaryacct/bo/SalaryAcctConsolidatedTaxBO.java | 105 - + .../entity/salaryacct/bo/SalaryAcctEmployeeBO.java | 171 - + .../entity/salaryacct/bo/SalaryAcctFormulaBO.java | 140 - + .../entity/salaryacct/bo/SalaryAcctRecordBO.java | 181 - + .../entity/salaryacct/bo/SalaryAcctResultBO.java | 904 --- + .../salaryacct/bo/SalaryAcctResultListContext.java | 52 - + .../salaryacct/bo/SalaryAcctResultLogBO.java | 40 - + .../entity/salaryacct/bo/SalaryCalcContext.java | 46 - + .../salaryacct/bo/SalaryCalcEmployeeContext.java | 41 - + .../entity/salaryacct/bo/SalaryCalcFormula.java | 53 - + .../salaryacct/bo/SalaryCalcFormulaContext.java | 105 - + .../entity/salaryacct/bo/SalaryCalcResult.java | 34 - + .../salary/entity/salaryacct/bo/SalaryCheckBO.java | 228 - + .../entity/salaryacct/bo/SalaryCheckResultBO.java | 93 - + .../salaryacct/dto/ConsolidatedTaxDetailDTO.java | 27 - + .../salaryacct/dto/SalaryAccEmployeeListDTO.java | 69 - + .../dto/SalaryAcctEmpSearchConditionDTO.java | 60 - + .../salaryacct/dto/SalaryAcctEmployeeCountDTO.java | 23 - + .../salaryacct/dto/SalaryAcctEmployeeInfoDTO.java | 36 - + .../salaryacct/dto/SalaryAcctImportFieldDTO.java | 73 - + .../entity/salaryacct/dto/SalaryAcctRateDTO.java | 41 - + .../salaryacct/dto/SalaryAcctRecordFormDTO.java | 39 - + .../salaryacct/dto/SalaryAcctRecordListDTO.java | 74 - + .../salaryacct/dto/SalaryAcctResultDetailDTO.java | 97 - + .../dto/SalaryAcctResultListColumnDTO.java | 32 - + .../dto/SalaryAcctResultSearchConditionDTO.java | 72 - + .../dto/SalaryAcctResultTemplateDTO.java | 44 - + .../salaryacct/dto/SalaryCheckResultListDTO.java | 66 - + .../dto/SalaryCheckResultRecordCountDTO.java | 21 - + .../dto/SalaryCheckResultRecordListDTO.java | 62 - + .../dto/SalaryComparisonResultListDTO.java | 32 - + .../salaryacct/param/SalaryAcctCalculateParam.java | 30 - + .../salaryacct/param/SalaryAcctCheckParam.java | 34 - + .../param/SalaryAcctEmpCheckTaxAgentParam.java | 19 - + .../param/SalaryAcctEmpRefreshTaxAgentParam.java | 19 - + .../param/SalaryAcctEmployeeAddParam.jav \ No newline at end of file diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java index 419f8f1e0..9f151ed02 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java @@ -84,11 +84,24 @@ public class TaxDeclarationWageListDTO { @ExcelHead(title = "住房公积金", dataIndex = "housingProvidentFund") private String housingProvidentFund; + /** + * @param null: + * @return null + * @author 赵鹏 + * @description TODO 修改个税申报表详情列表 字段顺序： + * 累计子女教育、累计继续教育、累计住房贷款利息、累计住房租金、累计赡养老人、累计婴幼儿照护费用、企业（职业）年金、累计个人养老金； + * @date 2025/12/5 005 上午 10:32 + */ @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") @ExcelHead(title = "累计子女教育", dataIndex = "addUpChildEducation") private String addUpChildEducation; + @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") + @ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation") + private String addUpContinuingEducation; + @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") @ExcelHead(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest") @@ -98,37 +111,33 @@ public class TaxDeclarationWageListDTO { @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") @ExcelHead(title = "累计住房租金", dataIndex = "addUpHousingRent") private String addUpHousingRent; - - @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") - @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") - @ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation") - private String addUpContinuingEducation; - @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") @ExcelHead(title = "累计赡养老人", dataIndex = "addUpSupportElderly") private String addUpSupportElderly; - @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") - @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") - @ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical") - private String addUpIllnessMedical; - - @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare") - @TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") - @ExcelHead(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare") + @SalaryTableColumn(text = "累计婴幼儿照护费用", width = "10%", column = "addUpInfantCare") + @TableTitle(title = "累计婴幼儿照护费用", dataIndex = "addUpInfantCare", key = "addUpInfantCare") + @ExcelHead(title = "累计婴幼儿照护费用", dataIndex = "addUpInfantCare") private String addUpInfantCare; - @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") - @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") - @ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension") - private String addUpPrivatePension; - @SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity") @TableTitle(title = "企业（职业）年金", dataIndex = "annuity", key = "annuity") @ExcelHead(title = "企业（职业）年金", dataIndex = "annuity") private String annuity; + @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") + @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") + @ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension") + private String addUpPrivatePension; + + // TODO ============================== edit end ====================================== + + // 删除 累计大病医疗 +// @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") +// @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") +// @ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical") + private String addUpIllnessMedical; @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance") @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance") @ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance")